Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Home screen #90

Merged
merged 2 commits into from
Jul 10, 2022
Merged

Home screen #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e7248
Changes according to code review
Nodrex Jul 10, 2022
df4fccf
Merge branch 'main' into home_screen
Nodrex Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,13 @@ fun CardButton(
bottomSheetState: BottomSheetState
) {
val scope = rememberCoroutineScope()
val comingSoonStr = stringResource(id = R.string.coming_soon)

Card(modifier = Modifier.size(125.dp), shape = RoundedCornerShape(10.dp), onClick = {
when (destinationInfo.destination.route) {
SKILLZ_ROUT, DUMMY_ROUT -> {
scope.launch {
scaffoldState.snackbarHostState.showSnackbar("Coming soon...") //TODO enrich, like add dismissible
scaffoldState.snackbarHostState.showSnackbar(comingSoonStr)
}
return@Card
}
Expand Down
1 change: 1 addition & 0 deletions testomania/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
<string name="creator_developers">Creator Developers:</string>
<string name="navigation_finish">Finish</string>
<string name="navigation_next">Next</string>
<string name="coming_soon">Coming soon...</string>
</resources>
25 changes: 0 additions & 25 deletions testomania/src/main/res/xml-v25/shortcuts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">

<!--<shortcut
android:enabled="true"
android:icon="@drawable/ic_math"
android:shortcutId="Math"
android:shortcutLongLabel="@string/general_skills_tests"
android:shortcutShortLabel="@string/general_skills_tests_short_name">
<intent
android:action="android.intent.action.VIEW"
android:data="testomania://home/skillz"
android:targetClass="com.earth.testomania.MainActivity"
android:targetPackage="com.earth.testomania" />
</shortcut>-->

<shortcut
android:enabled="true"
android:icon="@drawable/ic_orbit_dashboard"
Expand All @@ -27,16 +14,4 @@
android:targetPackage="com.earth.testomania" />
</shortcut>

<!--<shortcut
android:enabled="true"
android:icon="@drawable/ic_driver_license"
android:shortcutId="Driver License"
android:shortcutLongLabel="@string/driving_license_tests"
android:shortcutShortLabel="@string/driving_license_tests">
<intent
android:action="android.intent.action.VIEW"
android:targetClass="com.earth.testomania.MainActivity"
android:targetPackage="com.earth.testomania" />
</shortcut>-->

</shortcuts>