Skip to content

Commit 12596e4

Browse files
Revert "Refactor: resourses (openedx#455)"
This reverts commit 7ac24f6.
1 parent 7ac24f6 commit 12596e4

File tree

71 files changed

+624
-218
lines changed

Some content is hidden

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

71 files changed

+624
-218
lines changed

app/src/main/java/org/openedx/app/system/push/OpenEdXFirebaseMessagingService.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.openedx.app.system.push
33
import android.app.NotificationChannel
44
import android.app.NotificationManager
55
import android.app.PendingIntent
6+
import android.content.Context
67
import android.content.Intent
78
import android.media.RingtoneManager
89
import android.os.Build
@@ -74,7 +75,7 @@ class OpenEdXFirebaseMessagingService : FirebaseMessagingService() {
7475
.setContentIntent(pendingIntent)
7576

7677
val notificationManager =
77-
getSystemService(NOTIFICATION_SERVICE) as NotificationManager
78+
getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
7879

7980
// Since android Oreo notification channel is needed.
8081
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
File renamed without changes.
4.18 KB
Loading

app/src/main/res/values/dimens.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
<resources></resources>
1+
<resources>
2+
<dimen name="fab_margin">16dp</dimen>
3+
</resources>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="ic_launcher_background">#72BB25</color>
4+
</resources>

app/src/main/res/values/splash.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<!-- Use windowSplashScreenAnimatedIcon to add either a drawable or an
99
animated drawable. One of these is required. -->
10-
<item name="windowSplashScreenAnimatedIcon">@drawable/app_splash_inset</item>
10+
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_inset</item>
1111
<!-- Required for animated icons -->
1212

1313
<item name="windowSplashScreenAnimationDuration">300</item>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<resources>
2+
<string name="action_settings">Settings</string>
3+
<string name="next">Next</string>
4+
<string name="previous">Previous</string>
5+
26
<string name="app_navigation_discovery">Discover</string>
37
<string name="app_navigation_learn">Learn</string>
8+
<string name="app_navigation_programs">Programs</string>
49
<string name="app_navigation_profile">Profile</string>
510
<string name="app_navigation_downloads">Downloads</string>
611
</resources>

auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private fun RestorePasswordScreen(
186186
modifier = Modifier
187187
.fillMaxWidth()
188188
.height(200.dp),
189-
painter = painterResource(id = R.drawable.core_top_header),
189+
painter = painterResource(id = org.openedx.core.R.drawable.core_top_header),
190190
contentScale = ContentScale.FillBounds,
191191
contentDescription = null
192192
)

auth/src/main/java/org/openedx/auth/presentation/signup/compose/SocialSignedView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ internal fun SocialSignedView(authType: AuthType) {
4040
modifier = Modifier
4141
.padding(end = 8.dp)
4242
.size(20.dp),
43-
painter = painterResource(id = coreR.drawable.core_ic_check),
43+
painter = painterResource(id = coreR.drawable.ic_core_check),
4444
tint = MaterialTheme.appColors.successBackground,
4545
contentDescription = ""
4646
)

auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class BrowserAuthHelper(private val config: Config) {
2525
.appendQueryParameter("response_type", ApiConstants.BrowserLogin.RESPONSE_TYPE).build()
2626
val intent =
2727
CustomTabsIntent.Builder().setUrlBarHidingEnabled(true).setShowTitle(true).build()
28-
intent.intent.flags = FLAG_ACTIVITY_NEW_TASK
28+
intent.intent.setFlags(FLAG_ACTIVITY_NEW_TASK)
2929
intent.launchUrl(activityContext, uri)
3030
}
3131

0 commit comments

Comments
 (0)