wildercayden/ScoutingApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict resolution

Browse Source
This commit is contained in:
Tyler.Jacques00@gmail.com 2025-01-16 13:09:17 -05:00
commit b3ff8d8e98
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
View File

@ -1,10 +1,12 @@
package com.example.scoutingapp; package com.example.scoutingapp;
import android.content.Intent;
import static java.sql.DriverManager.println; import static java.sql.DriverManager.println;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.view.View;
import android.widget.Button;
import androidx.activity.EdgeToEdge; import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@ -29,11 +31,19 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
EdgeToEdge.enable(this); EdgeToEdge.enable(this);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.NextPlaceholder), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets; return insets;
}); });
Button nextButton = (Button) findViewById(R.id.nextButton);
nextButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
makeIntent();
}
});
} }
@ -61,11 +71,10 @@ public class MainActivity extends AppCompatActivity {
for (int i = 0, size = responseHeaders.size(); i < size; i++) { for (int i = 0, size = responseHeaders.size(); i < size; i++) {
System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i)); System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
} }
System.out.println(responseBody.string());
}
}
});
} }
private void makeIntent()
{
Intent intent = new Intent(this, AutoActivity.class);
startActivity(intent);
} }
} }