SetUpActivityがエラーを起こしていたので、再度作り直しました
This commit is contained in:
parent
86e77532dc
commit
afa4b678e0
|
@ -1,6 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
|
||||||
xmlns:tools="http://schemas.android.com/tools" >
|
xmlns:tools="http://schemas.android.com/tools" >
|
||||||
|
|
||||||
<application
|
<application
|
||||||
|
@ -14,22 +13,19 @@
|
||||||
android:theme="@style/Theme.Oplogy"
|
android:theme="@style/Theme.Oplogy"
|
||||||
tools:ignore="ExtraText"
|
tools:ignore="ExtraText"
|
||||||
tools:targetApi="31" >
|
tools:targetApi="31" >
|
||||||
|
<activity
|
||||||
|
android:name=".SetUpActivity"
|
||||||
|
android:exported="false" />
|
||||||
<!-- 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 -->
|
<!-- 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 -->
|
<!-- 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}". -->
|
<!-- "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
|
<activity
|
||||||
android:name=".Maps"
|
android:name=".Maps"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
|
@ -43,22 +39,16 @@
|
||||||
<activity
|
<activity
|
||||||
android:name=".RootSearchActivity"
|
android:name=".RootSearchActivity"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
<activity
|
|
||||||
android:name=".SetupActivity"
|
|
||||||
android:exported="false" />
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".CreateUUID"
|
android:name=".CreateUUID"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="com.example.oplogy.DialogFragment"
|
android:name=".DialogFragment"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
tools:ignore="DuplicateActivity" >
|
tools:ignore="DuplicateActivity" >
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
@ -68,11 +58,3 @@
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
||||||
// セットアップのクリック処理
|
// セットアップのクリック処理
|
||||||
if(view == setUp){
|
if(view == setUp){
|
||||||
imageSetup.setImageResource(R.drawable.ischecked_uuid);
|
imageSetup.setImageResource(R.drawable.ischecked_uuid);
|
||||||
Intent toSetup = new Intent(MainActivity.this,SetupActivity.class);
|
Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
|
||||||
startActivity(toSetup);
|
startActivity(toSetup);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".SetUpActivity"
|
tools:context=".SetUpActivity"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:gravity="center"
|
android:gravity="center">
|
||||||
android:layout_margin="25dp">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context=".SetupActivity">
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
Loading…
Reference in New Issue
Block a user