Skip to content

Commit 7aba22b

Browse files
GurupreetGurupreet
committed
fixed crash on launch because of FontAwesome lib version
1 parent 8dee327 commit 7aba22b

File tree

105 files changed

+342
-268
lines changed

Some content is hidden

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

105 files changed

+342
-268
lines changed

‎.idea/deploymentTargetDropDown.xml‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎animations/canvas/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import com.guru.composecookbook.build.dependencies.*
1+
import com.guru.composecookbook.build.dependencies.addComposeOfficialDependencies
22

33
plugins {
44
/**

‎animations/canvas/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.guru.composecookbook.canvas">
2+
<manifest package="com.guru.composecookbook.canvas">
43

54
</manifest>

‎animations/lottie/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import com.guru.composecookbook.build.dependencies.*
1+
import com.guru.composecookbook.build.dependencies.addComposeOfficialDependencies
2+
import com.guru.composecookbook.build.dependencies.addCoreAndroidDependencies
3+
import com.guru.composecookbook.build.dependencies.addThirdPartyUiDependencies
24

35
plugins {
46
/**

‎animations/lottie/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.guru.composecookbook.lottie">
2+
<manifest package="com.guru.composecookbook.lottie">
43

54
</manifest>

‎app/src/androidTest/java/com/guru/composecookbook/ui/home/home_screen_options/LayoutsTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class LayoutsTest {
9797
}
9898

9999
@Test
100-
fun assertIfColumnBottomVisible() {
100+
fun assertIfColumnBottomVisible() {
101101
clickOnLayoutButton()
102102
composeAndroidTestRule.apply {
103103
onNodeWithTag(TestTags.HOME_LAYOUTS_COLUMN_BOTTOM)

‎app/src/androidTest/java/com/guru/composecookbook/ui/home/home_screen_options/flings/FlingSettingsPageTest.kt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ class FlingSettingsPageTest {
103103
onNodeWithTag(TestTags.HOME_FLING_HEADER)
104104
.assertIsDisplayed()
105105

106-
Assert.assertEquals(FlingStateStore.INSTANCE.type.name.lowercase(Locale.getDefault()),
107-
"native")
106+
Assert.assertEquals(
107+
FlingStateStore.INSTANCE.type.name.lowercase(Locale.getDefault()),
108+
"native"
109+
)
108110

109111
}
110112
}
@@ -125,8 +127,10 @@ class FlingSettingsPageTest {
125127
onNodeWithTag(TestTags.HOME_FLING_HEADER)
126128
.assertIsDisplayed()
127129

128-
Assert.assertEquals(FlingStateStore.INSTANCE.type.name.lowercase(Locale.getDefault()),
129-
"smooth")
130+
Assert.assertEquals(
131+
FlingStateStore.INSTANCE.type.name.lowercase(Locale.getDefault()),
132+
"smooth"
133+
)
130134

131135
}
132136
}
@@ -147,8 +151,10 @@ class FlingSettingsPageTest {
147151
onNodeWithTag(TestTags.HOME_FLING_HEADER)
148152
.assertIsDisplayed()
149153

150-
Assert.assertEquals(FlingStateStore.INSTANCE.type.name.lowercase(Locale.getDefault()),
151-
"custom")
154+
Assert.assertEquals(
155+
FlingStateStore.INSTANCE.type.name.lowercase(Locale.getDefault()),
156+
"custom"
157+
)
152158
}
153159
}
154160

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131
android:name=".ui.home.customfling.FlingListSettingsActivity"
3232
android:label="@string/title_activity_custom_fling_settings"
3333
android:theme="@style/Theme.ComposeCookBook.NoActionBar" />
34+
3435
<meta-data
3536
android:name="com.google.android.gms.ads.APPLICATION_ID"
3637
android:value="@string/test_admob_id" /> <!-- insert your maps api key below to see maps -->
3738
<meta-data
3839
android:name="com.google.android.geo.API_KEY"
3940
android:value="" />
41+
4042
<activity
4143
android:name=".MainActivity"
4244
android:label="@string/app_name"

‎app/src/main/java/com/guru/composecookbook/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import androidx.compose.ui.semantics.contentDescription
2121
import androidx.compose.ui.semantics.semantics
2222
import androidx.compose.ui.tooling.preview.Preview
2323
import com.google.android.gms.ads.MobileAds
24-
import com.guru.composecookbook.ui.utils.TestTags
2524
import com.guru.composecookbook.theme.*
2625
import com.guru.composecookbook.ui.demoapps.DemoUIList
2726
import com.guru.composecookbook.ui.home.HomeScreen
2827
import com.guru.composecookbook.ui.learnwidgets.WidgetScreen
2928
import com.guru.composecookbook.ui.templates.TemplateScreen
3029
import com.guru.composecookbook.ui.utils.RotateIcon
30+
import com.guru.composecookbook.ui.utils.TestTags
3131
import com.guru.fontawesomecomposelib.FaIcon
3232

3333
class MainActivity : ComponentActivity() {

‎app/src/main/java/com/guru/composecookbook/ui/animation/AnimationScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import androidx.compose.ui.Alignment
1313
import androidx.compose.ui.Modifier
1414
import androidx.compose.ui.platform.testTag
1515
import androidx.compose.ui.unit.dp
16-
import com.guru.composecookbook.ui.utils.TestTags
16+
import com.guru.composecookbook.colorpicker.ColorPicker
1717
import com.guru.composecookbook.ui.animation.AnimatableSuspendedAnimations
1818
import com.guru.composecookbook.ui.animation.AnimationsForStates
1919
import com.guru.composecookbook.ui.animation.AnimationsWithVisibilityApi
2020
import com.guru.composecookbook.ui.animation.TransitionAnimationsWithMultipleStates
21-
import com.guru.composecookbook.colorpicker.ColorPicker
2221
import com.guru.composecookbook.ui.utils.RotateIcon
22+
import com.guru.composecookbook.ui.utils.TestTags
2323
import com.guru.composecookbook.ui.utils.TitleText
2424

2525
enum class MyAnimationState {

0 commit comments

Comments
 (0)