Ns1-j/oplogy
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

マージによるファイルの干渉を原因としたAndroidManifestのエラーを修正

Browse Source
This commit is contained in:
it232115 2024-06-11 14:49:54 +09:00
parent 4639ee8d53
commit 248666695e
1 changed files with 34 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/AndroidManifest.xml
View File

@ -12,54 +12,24 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Oplogy" android:theme="@style/Theme.Oplogy"
tools:targetApi="31"> tools:ignore="ExtraText"
<activity
android:name=".SetUpActivity"
android:exported="false" />
xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Oplogy"
tools:targetApi="31"> tools:targetApi="31">
<!-- TODO: Before you run your application, you need a Google Maps API key.-->
TODO: Before you run your application, you need a Google Maps API key. <!-- To get one, follow the directions here:-->
To get one, follow the directions here: <!-- https://developers.google.com/maps/documentation/android-sdk/get-api-key-->
https://developers.google.com/maps/documentation/android-sdk/get-api-key <!-- Once you have your API key (it starts with "AIza"), define a new property in your-->
<!-- project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the-->
Once you have your API key (it starts with "AIza"), define a new property in your <!-- "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".-->
project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the
"YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".
<meta-data <meta-data
android:name="com.google.android.geo.API_KEY" android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" /> android:value="AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" />
<activity
android:name=".MapsActivity"
android:exported="true"
android:label="@string/title_activity_maps">
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
</activity>
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<activity <activity
android:name=".Maps" android:name=".Maps"
android:exported="false" android:exported="false"
@ -82,12 +52,13 @@ xmlns:tools="http://schemas.android.com/tools">
<activity <activity
android:name="com.example.oplogy.DialogFragment" android:name="com.example.oplogy.DialogFragment"
android:exported="false" android:exported="false" />
/>
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"> android:exported="true"
tools:ignore="DuplicateActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />