Skip to content

Commit e0feb9d

Browse files
ShwetaChauhan18ShwetaChauhan18
authored
Merge pull request #17 from SimformSolutionsPvtLtd/feature/UNT-T5677_name_refctore
🎨 UNT-T5677 Name Refactor.
2 parents 5f5c7fb + 49c64ff commit e0feb9d

File tree

21 files changed

+61
-62
lines changed

21 files changed

+61
-62
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ dependencies {
5050
implementation "androidx.compose.material:material:$compose_version"
5151
implementation "androidx.compose.ui:ui-tooling:$compose_version"
5252
implementation 'androidx.activity:activity-compose:1.3.0-rc02'
53-
implementation project(path: ':ssloadingbuttonlibrary')
53+
implementation project(path: ':ssjetpackcomposeprogressbutton')
5454
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.simform.ssloadingbuttonandroid">
3+
package="com.simform.ssjetpackcomposeprogressbutton">
44

55
<application
66
android:allowBackup="true"
@@ -10,7 +10,7 @@
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.SSLoadingButtonAndroid">
1212
<activity
13-
android:name=".MainActivity"
13+
android:name="com.simform.ssjetpackcomposeprogressbutton.MainActivity"
1414
android:exported="true"
1515
android:label="@string/app_name"
1616
android:theme="@style/Theme.SSLoadingButtonAndroid.NoActionBar">

app/src/main/java/com/simform/ssloadingbuttonandroid/MainActivity.kt renamed to app/src/main/java/com/simform/ssjetpackcomposeprogressbutton/MainActivity.kt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.simform.ssloadingbuttonandroid
1+
package com.simform.ssjetpackcomposeprogressbutton
22

33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
@@ -41,16 +41,16 @@ import androidx.compose.ui.text.font.FontStyle
4141
import androidx.compose.ui.tooling.preview.Preview
4242
import androidx.compose.ui.unit.dp
4343
import androidx.compose.ui.unit.sp
44-
import com.simform.ssloadingbuttonandroid.utils.COMMON_HEIGHT
45-
import com.simform.ssloadingbuttonandroid.utils.COMMON_WIDTH
46-
import com.simform.ssloadingbuttonandroid.utils.forty
47-
import com.simform.ssloadingbuttonandroid.utils.oneFloat
48-
import com.simform.ssloadingbuttonandroid.utils.six
49-
import com.simform.ssloadingbuttonandroid.utils.two
50-
import com.simform.ssloadingbuttonandroid.utils.zero
51-
import com.simform.ssloadingbuttonlibrary.SSButtonState
52-
import com.simform.ssloadingbuttonlibrary.SSButtonType
53-
import com.simform.ssloadingbuttonlibrary.SSLoadingButton
44+
import com.simform.ssjetpackcomposeprogressbutton.utils.COMMON_HEIGHT
45+
import com.simform.ssjetpackcomposeprogressbutton.utils.COMMON_WIDTH
46+
import com.simform.ssjetpackcomposeprogressbutton.utils.forty
47+
import com.simform.ssjetpackcomposeprogressbutton.utils.oneFloat
48+
import com.simform.ssjetpackcomposeprogressbutton.utils.six
49+
import com.simform.ssjetpackcomposeprogressbutton.utils.two
50+
import com.simform.ssjetpackcomposeprogressbutton.utils.zero
51+
import com.simform.ssjetpackcomposeprogressbuttonlibrary.SSButtonState
52+
import com.simform.ssjetpackcomposeprogressbuttonlibrary.SSButtonType
53+
import com.simform.ssjetpackcomposeprogressbuttonlibrary.SSJetPackComposeProgressButton
5454

5555
class MainActivity : ComponentActivity() {
5656
override fun onCreate(savedInstanceState: Bundle?) {
@@ -137,7 +137,7 @@ fun SSLoadingButtonExample() {
137137
}
138138
//Various example of SSLoadingButton
139139
item {
140-
SSLoadingButton(
140+
SSJetPackComposeProgressButton(
141141
assetColor = Color.Red,
142142
colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
143143
buttonBorderStroke = BorderStroke(two.dp, SolidColor(Color.Red)),
@@ -147,7 +147,7 @@ fun SSLoadingButtonExample() {
147147
width = COMMON_WIDTH.dp, height = COMMON_HEIGHT.dp, padding = PaddingValues(six.dp),
148148
leftImagePainter = rememberVectorPainter(image = Icons.Default.Home)
149149
)
150-
SSLoadingButton(
150+
SSJetPackComposeProgressButton(
151151
assetColor = colorResource(id = R.color.dark_green),
152152
colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
153153
buttonBorderStroke = BorderStroke(
@@ -160,7 +160,7 @@ fun SSLoadingButtonExample() {
160160
width = COMMON_WIDTH.dp, height = COMMON_HEIGHT.dp, padding = PaddingValues(six.dp),
161161
leftImagePainter = rememberVectorPainter(image = Icons.Default.Home)
162162
)
163-
SSLoadingButton(
163+
SSJetPackComposeProgressButton(
164164
assetColor = Color.Blue,
165165
colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
166166
buttonBorderStroke = BorderStroke(two.dp, SolidColor(Color.Blue)),
@@ -170,7 +170,7 @@ fun SSLoadingButtonExample() {
170170
width = COMMON_WIDTH.dp, height = COMMON_HEIGHT.dp, padding = PaddingValues(six.dp),
171171
leftImagePainter = rememberVectorPainter(image = Icons.Default.Home)
172172
)
173-
SSLoadingButton(
173+
SSJetPackComposeProgressButton(
174174
assetColor = Color.Red,
175175
colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
176176
buttonBorderStroke = BorderStroke(two.dp, SolidColor(Color.Red)),
@@ -180,7 +180,7 @@ fun SSLoadingButtonExample() {
180180
width = COMMON_WIDTH.dp, height = COMMON_HEIGHT.dp, padding = PaddingValues(six.dp),
181181
leftImagePainter = rememberVectorPainter(image = Icons.Default.Home)
182182
)
183-
SSLoadingButton(
183+
SSJetPackComposeProgressButton(
184184
assetColor = Color.Blue,
185185
colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
186186
buttonBorderStroke = BorderStroke(two.dp, SolidColor(Color.Blue)),
@@ -190,7 +190,7 @@ fun SSLoadingButtonExample() {
190190
width = COMMON_WIDTH.dp, height = COMMON_HEIGHT.dp, padding = PaddingValues(six.dp),
191191
leftImagePainter = rememberVectorPainter(image = Icons.Default.Home)
192192
)
193-
SSLoadingButton(
193+
SSJetPackComposeProgressButton(
194194
assetColor = Color.White,
195195
colors = ButtonDefaults.buttonColors(backgroundColor = Color.Red),
196196
type = SSButtonType.CIRCLE,
@@ -199,7 +199,7 @@ fun SSLoadingButtonExample() {
199199
width = COMMON_WIDTH.dp, height = COMMON_HEIGHT.dp, padding = PaddingValues(six.dp),
200200
leftImagePainter = rememberVectorPainter(image = Icons.Default.Person)
201201
)
202-
SSLoadingButton(
202+
SSJetPackComposeProgressButton(
203203
assetColor = Color.Yellow,
204204
type = SSButtonType.CLOCK,
205205
onClick = { blinkingIcon = SSButtonState.LOADING },
@@ -211,7 +211,7 @@ fun SSLoadingButtonExample() {
211211
padding = PaddingValues(six.dp),
212212
hourHandColor = Color.Red
213213
)
214-
SSLoadingButton(
214+
SSJetPackComposeProgressButton(
215215
assetColor = Color.White,
216216
colors = ButtonDefaults.buttonColors(backgroundColor = colorResource(id = R.color.yellow)),
217217
buttonBorderStroke = BorderStroke(
@@ -230,7 +230,7 @@ fun SSLoadingButtonExample() {
230230
fontFamily = FontFamily.Monospace,
231231
textModifier = Modifier.padding(six.dp),
232232
)
233-
SSLoadingButton(
233+
SSJetPackComposeProgressButton(
234234
assetColor = Color.White,
235235
type = SSButtonType.WHEEL,
236236
onClick = { textWithIconState = SSButtonState.LOADING },
@@ -245,7 +245,7 @@ fun SSLoadingButtonExample() {
245245
padding = PaddingValues(six.dp),
246246
colors = ButtonDefaults.buttonColors( backgroundColor = colorResource(id = R.color.light_blue))
247247
)
248-
SSLoadingButton(
248+
SSJetPackComposeProgressButton(
249249
assetColor = Color.White,
250250
type = SSButtonType.SPIRAL,
251251
onClick = { textWithRightButton = SSButtonState.LOADING },

app/src/main/java/com/simform/ssloadingbuttonandroid/utils/Constant.kt renamed to app/src/main/java/com/simform/ssjetpackcomposeprogressbutton/utils/Constant.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.simform.ssloadingbuttonandroid.utils
1+
package com.simform.ssjetpackcomposeprogressbutton.utils
22

33

44
const val COMMON_WIDTH = 370

‎settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ dependencyResolutionManagement {
66
maven { url 'https://jitpack.io' }
77
}
88
}
9-
rootProject.name = "SSLoadingButtonAndroid"
9+
rootProject.name = "SSJetPackComposeProgressButton"
1010
include ':app'
11-
include ':ssloadingbuttonlibrary'
11+
include ':ssjetpackcomposeprogressbutton'

ssloadingbuttonlibrary/.gitignore renamed to ssjetpackcomposeprogressbutton/.gitignore

File renamed without changes.

ssloadingbuttonlibrary/build.gradle renamed to ssjetpackcomposeprogressbutton/build.gradle

File renamed without changes.

ssloadingbuttonlibrary/consumer-rules.pro renamed to ssjetpackcomposeprogressbutton/consumer-rules.pro

File renamed without changes.

ssloadingbuttonlibrary/proguard-rules.pro renamed to ssjetpackcomposeprogressbutton/proguard-rules.pro

File renamed without changes.

ssloadingbuttonlibrary/src/androidTest/java/com/simform/ssloadingbuttonlibrary/ExampleInstrumentedTest.kt renamed to ssjetpackcomposeprogressbutton/src/androidTest/java/com/simform/ssjetpackcomposeprogressbuttonlibrary/ExampleInstrumentedTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.simform.ssloadingbuttonlibrary
1+
package com.simform.ssjetpackcomposeprogressbuttonlibrary
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4

0 commit comments

Comments
 (0)