Upgrade auf AndroidStudio Narwhal

MDecker-MobileComputing · MDecker-MobileComputing · commit 8fbdeaced9f2 · 2025-08-20T10:50:47.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    namespace 'de.mide.zweiactivities'
-    compileSdk 34
+    namespace 'de.mide.android.zweiactivites'
+    compileSdk 36
 
     defaultConfig {
-        applicationId "de.mide.zweiactivities"
+        applicationId "de.mide.android.zweiactivites"
         minSdk 24
-        targetSdk 34
+        targetSdk 36
         versionCode 1
         versionName "1.0"
 
@@ -23,8 +23,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
diff --git a/app/src/androidTest/java/de/mide/android/zweiactivites/ExampleInstrumentedTest.java b/app/src/androidTest/java/de/mide/android/zweiactivites/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package de.mide.zweiactivities;
+package de.mide.android.zweiactivites;
 
 import android.content.Context;
 
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("de.mide.zweiactivities", appContext.getPackageName());
+        assertEquals("de.mide.android.zweiactivites", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="auto">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -11,22 +11,25 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.ZweiActivities"
-        tools:targetApi="31">
-
-        <activity
-            android:name=".Activity2"
-            android:exported="false" />
+        android:theme="@style/Theme.ZweiActivites">
 
         <activity
             android:name=".Activity1"
             android:exported="true">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+
             </intent-filter>
+
         </activity>
 
+
+        <activity
+            android:name=".Activity2"
+            android:exported="false" />
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/de/mide/android/zweiactivites/Activity1.java b/app/src/main/java/de/mide/android/zweiactivites/Activity1.java
@@ -1,4 +1,4 @@
-package de.mide.zweiactivities;
+package de.mide.android.zweiactivites;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -16,7 +16,7 @@
  * This project is licensed under the terms of the BSD 3-Clause License.
  */
 public class Activity1 extends Activity
-                       implements View.OnClickListener {
+                        implements View.OnClickListener {
 
     /** UI-Elemente zur Eingabe von Text durch den Nutzer. */
     protected EditText _editText = null;
diff --git a/app/src/main/java/de/mide/android/zweiactivites/Activity2.java b/app/src/main/java/de/mide/android/zweiactivites/Activity2.java
@@ -1,4 +1,4 @@
-package de.mide.zweiactivities;
+package de.mide.android.zweiactivites;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -17,7 +17,7 @@
  * This project is licensed under the terms of the BSD 3-Clause License.
  */
 public class Activity2 extends Activity
-                       implements View.OnClickListener {
+        implements View.OnClickListener {
 
     /** UI-Element zur Anzeige von Text, der auf Activity1 eingegeben wurde. */
     protected TextView _textView = null;
diff --git a/app/src/main/res/layout/activity_1.xml b/app/src/main/res/layout/activity_1.xml
@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:background="#FFFF00"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     tools:context=".Activity1">
 
     <EditText
diff --git a/app/src/main/res/layout/activity_2.xml b/app/src/main/res/layout/activity_2.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#8030FF00"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     tools:context=".Activity2">
 
     <EditText
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.ZweiActivities" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+    <style name="Base.Theme.ZweiActivites" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your dark theme here. -->
+        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,16 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.ZweiActivities" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+    <style name="Base.Theme.ZweiActivites" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
+
+    <style name="Theme.ZweiActivites" parent="Base.Theme.ZweiActivites" />
 </resources>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
@@ -2,7 +2,7 @@
    Sample backup rules file; uncomment and customize as necessary.
    See https://developer.android.com/guide/topics/data/autobackup
    for details.
-   Note: This file is ignored for devices older that API 31
+   Note: This file is ignored for devices older than API 31
    See https://developer.android.com/about/versions/12/backup-restore
 -->
 <full-backup-content>
diff --git a/app/src/test/java/de/mide/android/zweiactivites/ExampleUnitTest.java b/app/src/test/java/de/mide/android/zweiactivites/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package de.mide.zweiactivities;
+package de.mide.android.zweiactivites;
 
 import org.junit.Test;
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-agp = "8.5.1"
+agp = "8.12.1"
 junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
-appcompat = "1.7.0"
+junitVersion = "1.3.0"
+espressoCore = "3.7.0"
+appcompat = "1.7.1"
 material = "1.12.0"
-activity = "1.9.1"
-constraintlayout = "2.1.4"
+activity = "1.10.1"
+constraintlayout = "2.2.1"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 11 08:54:13 CEST 2024
+#Wed Aug 20 10:26:31 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -19,5 +19,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Zwei Activities"
+rootProject.name = "Zwei Activites"
 include ':app'

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`android {`
`6`		`- namespace 'de.mide.zweiactivities'`
`7`		`- compileSdk 34`
	`6`	`+ namespace 'de.mide.android.zweiactivites'`
	`7`	`+ compileSdk 36`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`		`- applicationId "de.mide.zweiactivities"`
	`10`	`+ applicationId "de.mide.android.zweiactivites"`
`11`	`11`	`minSdk 24`
`12`		`- targetSdk 34`
	`12`	`+ targetSdk 36`
`13`	`13`	`versionCode 1`
`14`	`14`	`versionName "1.0"`
`15`	`15`
`@@ -23,8 +23,8 @@ android {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`compileOptions {`
`26`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`27`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`26`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`27`	`+ targetCompatibility JavaVersion.VERSION_11`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.mide.zweiactivities;`
	`1`	`+package de.mide.android.zweiactivites;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`
`@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {`
`21`	`21`	`public void useAppContext() {`
`22`	`22`	`// Context of the app under test.`
`23`	`23`	`Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();`
`24`		`- assertEquals("de.mide.zweiactivities", appContext.getPackageName());`
	`24`	`+ assertEquals("de.mide.android.zweiactivites", appContext.getPackageName());`
`25`	`25`	`}`
`26`	`26`	`}`