From ca1b8a647e310a7080256ad739faad12d2426205 Mon Sep 17 00:00:00 2001 From: ErolHaagenrud Date: Wed, 7 Jan 2026 10:26:35 +0100 Subject: [PATCH] =?UTF-8?q?F=C3=B8r=20oppdateringer=20av=20fragment.home.x?= =?UTF-8?q?ml,=20HomeAdapter.java=20og=20HomeFragment.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 19 +++++++++++++++++++ .../com/kbs/kbsintranett/MainActivity.java | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 962afa0..4ca00ab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,9 +1,21 @@ +import java.util.Properties +import java.io.FileInputStream + plugins { alias(libs.plugins.android.application) // NY LINJE: Aktiver Google Services plugin her id("com.google.gms.google-services") } +// --- NY KODE: Last inn local.properties --- +// Vi bruker "Properties()" direkte siden vi har importert den på toppen +val localProperties = Properties() +val localPropertiesFile = rootProject.file("local.properties") +if (localPropertiesFile.exists()) { + localProperties.load(FileInputStream(localPropertiesFile)) +} +// ------------------------------------------ + android { namespace = "com.kbs.kbsintranett" compileSdk = 34 @@ -16,6 +28,13 @@ android { versionName = "1.5.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + + // Hent verdien vi lastet inn på toppen av filen + val webClientId = localProperties.getProperty("WEB_CLIENT_ID") ?: "" + + // Opprett BuildConfig-feltet. + // Vi legger på ekstra hermetegn (\") for at det skal bli en String i Java-koden. + buildConfigField("String", "WEB_CLIENT_ID", "\"$webClientId\"") } // NYTT: Dette må til for å kunne bruke BuildConfig.DEBUG i koden diff --git a/app/src/main/java/com/kbs/kbsintranett/MainActivity.java b/app/src/main/java/com/kbs/kbsintranett/MainActivity.java index 7b9e0b5..158c28a 100644 --- a/app/src/main/java/com/kbs/kbsintranett/MainActivity.java +++ b/app/src/main/java/com/kbs/kbsintranett/MainActivity.java @@ -30,7 +30,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView; public class MainActivity extends AppCompatActivity { - public static final String GOOGLE_WEB_CLIENT_ID = "738325360287-cidl3plnqv9ei74vm9vm5muustj6eenb.apps.googleusercontent.com"; // Bytt med din egen hvis denne er feil + public static final String GOOGLE_WEB_CLIENT_ID = BuildConfig.WEB_CLIENT_ID; private static final String TAG = "MainActivity"; private NavController navController;