Add in the Japanese translations to the release branch.

.cirrus.yml

@@ -1,9 +1,10 @@
 container:
-  image: cirrusci/android-sdk:30
+  image: ghcr.io/cirruslabs/android-sdk:33
   cpu: 8
   memory: 24G
   kvm: true
-
+  env:
+    JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
 check_android_task:
   # execution_lock: OneEmulatorAtATime
   list_versions_script:
@@ -34,11 +35,10 @@ check_android_task:
     build_artifacts:
       path: "app/build/reports/**"
 
-task:
-  name: Android Lint
+lint_task:
   lint_script: ./gradlew lintGmsDebug
   # always:
   #   android-lint_artifacts:
   #     path: "**/reports/lint-results-gmsDebug.xml"
   #     type: text/xml
-  #    format: android-lint
+  #    format: android-lint

.github/workflows/android.yml

@@ -12,11 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        distribution: 'zulu' # See 'Supported distributions' for available options
+        java-version: '17'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
@@ -25,20 +26,25 @@ jobs:
       uses: asadmansr/[email protected]
       if: ${{ always() }} # IMPORTANT: run Android Test Report regardless
   connected_test:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         api-level: [ 29 ]
-        target: [ playstore ]
+        target: [ default ]
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
 
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
-          distribution: 'adopt'
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
 
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2

README.md

@@ -1,6 +1,4 @@
 # Sky Map [![Build Status](https://travis-ci.org/sky-map-team/stardroid.svg?branch=master)](https://travis-ci.org/sky-map-team/stardroid)
-[![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/sky-map-team/stardroid.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/sky-map-team/stardroid/context:java)
-[![Total Alerts](https://img.shields.io/lgtm/alerts/g/sky-map-team/stardroid.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/sky-map-team/stardroid/alerts)
 
 This is the source repository for Sky Map.  You can find it in the [Google Play Store](https://play.google.com/store/apps/details?id=com.google.android.stardroid) and on [F-Droid](https://f-droid.org/en/packages/com.google.android.stardroid/).
 

app/build.gradle

@@ -1,28 +1,61 @@
 plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-android-extensions'
-    id 'kotlin-kapt'
+    id 'com.android.application' version '8.7.3'
+    id 'org.jetbrains.kotlin.android' version '2.0.20'
+    id 'org.jetbrains.kotlin.kapt' version '2.0.20'
 }
 
+
+/**
+ * Locate (and possibly download) a JDK used to build your kotlin
+ * source code. This also acts as a default for sourceCompatibility,
+ * targetCompatibility and jvmTarget. Note that this does not affect which JDK
+ * is used to run the Gradle build itself, and does not need to take into
+ * account the JDK version required by Gradle plugins (such as the
+ * Android Gradle Plugin)
+ */
+kotlin {
+    jvmToolchain(17)
+}
+
+/**
+ * The android block is where you configure all your Android-specific
+ * build options.
+ */
+
 android {
-    compileSdkVersion 31
+
+    /**
+     * The app's namespace. Used primarily to access app resources.
+     */
+
+    namespace 'com.google.android.stardroid'
+
+    /**
+     * compileSdk specifies the Android API level Gradle should use to
+     * compile your app. This means your app can use the API features included in
+     * this API level and lower.
+     */
+
+    compileSdk 35
+
+    /**
+     * The defaultConfig block encapsulates default settings and entries for all
+     * build variants and can override some attributes in main/AndroidManifest.xml
+     * dynamically from the build system. You can configure product flavors to override
+     * these values for different versions of your app.
+     */
 
     defaultConfig {
-        applicationId "com.google.android.stardroid"
-        minSdkVersion 26
-        targetSdkVersion 31
-        versionCode 1541
-        versionName "1.10.1 - RC1"
+        // Uniquely identifies the package for publishing.
+        applicationId 'com.google.android.stardroid'
+        minSdk 26
+        targetSdk 34  // 35 breaks the UI
+        versionCode 1560
+        versionName "1.10.9"
         buildConfigField 'String', 'GOOGLE_ANALYTICS_CODE', '""'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     signingConfigs {
         release {
             if (project.file('no-checkin.properties').exists()) {
@@ -52,49 +85,51 @@ android {
         }
     }
 
-    lintOptions {
-        // Lint complains because of missing translations.
-        // (Missing translations now removed)
-        abortOnError false
-    }
-
-    // This enables long timeouts required on slow environments, e.g. Travis
-    adbOptions {
-        timeOutInMs 10 * 60 * 1000  // 10 minutes
-        installOptions "-d", "-t"
-    }
-
-    testOptions {
-        animationsDisabled = true
-    }
-
-    flavorDimensions "default"
+    flavorDimensions = ["sourciness"]
     productFlavors {
         // includes gms Google services
         gms {
             resValue "string", "analytics_enabled", "true"
+            dimension "sourciness"
         }
 
         // uses only open source software
         fdroid {
             resValue "string", "analytics_enabled", "false"
+            dimension "sourciness"
         }
     }
+
+    lintOptions {
+        // TODO: fix the lint errors
+        abortOnError false
+    }
 }
 
+/**
+ * The dependencies block in the module-level build configuration file
+ * specifies dependencies required to build only the module itself.
+ * To learn more, go to Add build dependencies.
+ */
+
 dependencies {
+
     implementation project(path: ':datamodel')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 // Android support
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation "androidx.core:core-ktx:1.7.0"
+    def appcompat_version = "1.7.0"
+
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    // For loading and tinting drawables on older versions of the platform
+    implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation "androidx.core:core-ktx:1.15.0"
 
 // Third-party
-    implementation 'com.google.guava:guava:30.1.1-jre'
-    def dagger_version = "2.40"
+    implementation 'com.google.guava:guava:33.3.1-jre'
+    def dagger_version = "2.48"
     implementation "com.google.dagger:dagger:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
     // For annotations not in Android but needed by Dagger
@@ -104,25 +139,27 @@ dependencies {
     implementation 'com.google.protobuf:protobuf-javalite:3.13.0'
 
 // Flavor
-    gmsImplementation 'com.google.android.gms:play-services-analytics:18.0.0'
-    gmsImplementation 'com.google.android.gms:play-services-location:19.0.0'
-    gmsImplementation 'com.google.firebase:firebase-analytics:20.0.2'
+    gmsImplementation 'com.google.android.gms:play-services-analytics:18.1.1'
+    gmsImplementation 'com.google.android.gms:play-services-location:21.3.0'
+    gmsImplementation 'com.google.firebase:firebase-analytics:22.1.2'
 
 // Testing
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
-    testImplementation 'org.robolectric:robolectric:4.4'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.robolectric:robolectric:4.14.1'
     testImplementation 'org.easymock:easymock:2.5.2'
     testImplementation 'com.google.truth:truth:1.0.1'
-    androidTestImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'org.easymock:easymock:2.5.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
     // Optional -- Hamcrest library
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
     // Optional -- UI testing with Espresso
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     // Optional -- UI testing with UI Automator
     // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
+
+android.buildFeatures.buildConfig true

app/proguard.cfg

@@ -49,4 +49,5 @@
 
 # Proto lite
 # https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
--keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+-dontwarn com.google.protobuf.java_com_google_android_gmscore_sdk_target_granule__proguard_group_gtm_N1281923064GeneratedExtensionRegistryLite$Loader

app/src/main/AndroidManifest.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.google.android.stardroid"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
           android:vmSafeMode="false">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <uses-permission android:name="android.permission.INTERNET"/>

app/src/main/java/com/google/android/stardroid/ApplicationComponent.kt

@@ -43,8 +43,5 @@ interface ApplicationComponent {
 
   // Who can we inject
   fun inject(app: StardroidApplication)
-  fun inject(activity: EditSettingsActivity)
-  fun inject(activity: ImageDisplayActivity)
-  fun inject(activity: ImageGalleryActivity)
   fun inject(provider: SearchTermsProvider)
 }

app/src/main/java/com/google/android/stardroid/ApplicationConstants.kt

@@ -39,6 +39,8 @@ object ApplicationConstants {
   const val BUNDLE_Z_TARGET = "bundle_z_target"
   const val BUNDLE_SEARCH_MODE = "bundle_search"
   const val SOUND_EFFECTS = "sound_effects"
+  const val AUTO_DIMNESS = "auto_dimness"
+  const val FONT_SIZE = "font_size"
 
   // Preference that keeps track of whether or not the user accepted the ToS for this version
   const val READ_TOS_PREF_VERSION = "read_tos_version"

app/src/main/java/com/google/android/stardroid/ApplicationModule.kt

@@ -38,7 +38,7 @@ class ApplicationModule(private val app: StardroidApplication) {
 
   @Provides
   @Singleton
-  fun provideSharedPreferences() = PreferenceManager.getDefaultSharedPreferences(app)
+  fun provideSharedPreferences(): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(app)
 
   @Provides
   @Singleton
@@ -86,7 +86,7 @@ class ApplicationModule(private val app: StardroidApplication) {
 
   @Provides
   @Singleton
-  fun provideAccountManager(context: Context) = AccountManager.get(context)
+  fun provideAccountManager(context: Context): AccountManager = AccountManager.get(context)
 
   @Provides
   @Singleton
@@ -96,15 +96,15 @@ class ApplicationModule(private val app: StardroidApplication) {
   ): LayerManager {
     Log.i(TAG, "Initializing LayerManager")
     val layerManager = LayerManager(preferences)
-    layerManager.addLayer(StarsLayer(assetManager, resources))
-    layerManager.addLayer(MessierLayer(assetManager, resources))
-    layerManager.addLayer(ConstellationsLayer(assetManager, resources))
+    layerManager.addLayer(StarsLayer(assetManager, resources, preferences))
+    layerManager.addLayer(MessierLayer(assetManager, resources, preferences))
+    layerManager.addLayer(ConstellationsLayer(assetManager, resources, preferences))
     layerManager.addLayer(SolarSystemLayer(model!!, resources, preferences))
-    layerManager.addLayer(MeteorShowerLayer(model, resources))
-    layerManager.addLayer(CometsLayer(model, resources))
-    layerManager.addLayer(GridLayer(resources, 24, 9))
-    layerManager.addLayer(HorizonLayer(model, resources))
-    layerManager.addLayer(EclipticLayer(resources))
+    layerManager.addLayer(MeteorShowerLayer(model, resources, preferences))
+    layerManager.addLayer(CometsLayer(model, resources, preferences))
+    layerManager.addLayer(GridLayer(resources, 24, 9, preferences))
+    layerManager.addLayer(HorizonLayer(model, resources, preferences))
+    layerManager.addLayer(EclipticLayer(resources, preferences))
     layerManager.addLayer(SkyGradientLayer(model, resources))
     // layerManager.addLayer(new IssLayer(resources, model));
     layerManager.initialize()