diff --git a/BUILD.bazel b/BUILD.bazel index 7e63e989b6e..5ec630b2e00 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -55,8 +55,8 @@ android_binary( "applicationId": "org.oppia.android", "minSdkVersion": "19", "targetSdkVersion": "29", - "versionCode": "0", - "versionName": "0.1-alpha", + "versionCode": "5", + "versionName": "0.5-alpha-0dbe671eb8", }, multidex = "native", # TODO(#1875): Re-enable legacy for optimized release builds. deps = [ diff --git a/app/build.gradle b/app/build.gradle index ac56bf57d8f..eaad0c297ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "org.oppia.android" minSdkVersion 19 targetSdkVersion 29 - versionCode 1 - versionName "1.0" + versionCode 5 + versionName "0.5-alpha-0dbe671eb8" multiDexEnabled true testInstrumentationRunner "org.oppia.android.testing.OppiaTestRunner" // https://developer.android.com/training/testing/junit-runner#ato-gradle diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 308a0a49a5e..6eb1b3a372d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,10 +22,10 @@ android:value="false" /> + android:value="true" /> + android:value="2021-10-31" /> listOf(FRACTIONS_TOPIC_ID) - // TEST_TOPIC_ID_1 (depends on TEST_TOPIC_ID_0,Ratios) - TEST_TOPIC_ID_1 -> listOf(TEST_TOPIC_ID_0, RATIOS_TOPIC_ID) + // Place values depends on nothing since it's the first set of lessons to play. + REAL_PLACE_VALUES_TOPIC_ID -> listOf() // Fractions (depends on A+S, Multiplication, Division) - FRACTIONS_TOPIC_ID -> listOf() + REAL_FRACTIONS_TOPIC_ID -> listOf(REAL_MULTIPLICATION_TOPIC_ID) // Ratios (depends on A+S, Multiplication, Division) - RATIOS_TOPIC_ID -> listOf() + REAL_RATIOS_TOPIC_ID -> listOf(REAL_MULTIPLICATION_TOPIC_ID) // Addition and Subtraction (depends on Place Values) - // Multiplication (depends on Addition and Subtraction) + REAL_ADDITION_AND_SUBTRACTION_TOPIC_ID -> listOf(REAL_PLACE_VALUES_TOPIC_ID) + // Multiplication (depends on Addition and Subtraction); depend instead on Place Values as a + // poor proxy for A+S since that topic isn't yet available in the app. + REAL_MULTIPLICATION_TOPIC_ID -> listOf(REAL_PLACE_VALUES_TOPIC_ID) // Division (depends on Multiplication) + REAL_DIVISION_TOPIC_ID -> listOf(REAL_MULTIPLICATION_TOPIC_ID) // Expressions and Equations (depends on A+S, Multiplication, Division) // Decimals (depends on A+S, Multiplication, Division) else -> listOf() diff --git a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt index 0979764b659..b63330112a7 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt @@ -19,9 +19,9 @@ class CachingModule { @Provides @LoadLessonProtosFromAssets - fun provideLoadLessonProtosFromAssets(): Boolean = false + fun provideLoadLessonProtosFromAssets(): Boolean = true @Provides @LoadImagesFromAssets - fun provideLoadImagesFromAssets(): Boolean = false + fun provideLoadImagesFromAssets(): Boolean = true }