Skip to content
Snippets Groups Projects
Commit 6593c91a authored by s22thong's avatar s22thong
Browse files

refactor(DX): changed SecondActivity to DisplayUserActivity and renamed all ids

parent 08e1aa66
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/src/main/AndroidManifest.xml
+ 1
− 1
View file @ 6593c91a
......@@ -26,7 +26,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".SecondActivity" android:exported="true" />
<activity android:name=".DisplayUserActivity" android:exported="true" />
<activity android:name=".DatePickerActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.PICK" />
......
app/src/main/java/fr/imt_atlantique/myfirstapplication/SecondActivity.java → app/src/main/java/fr/imt_atlantique/myfirstapplication/DisplayUserActivity.java
+ 11
− 16
View file @ 6593c91a
......@@ -9,16 +9,11 @@ import android.os.Bundle;
import android.util.Log;
import android.content.Intent;
import android.Manifest;
import fr.imt_atlantique.myfirstapplication.User;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
......@@ -35,7 +30,7 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
public class SecondActivity extends AppCompatActivity {
public class DisplayUserActivity extends AppCompatActivity {
String firstName, lastName, birthCity, birthDept, birthDate = "";
ArrayList<String> phoneNumbersList = new ArrayList<>();
......@@ -45,8 +40,8 @@ public class SecondActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
Log.i("Lifecycle", "onCreate method");
EdgeToEdge.enable(this);
setContentView(R.layout.activity_second);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.second), (v, insets) -> {
setContentView(R.layout.activity_display_user);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.displayUserActivity), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
......@@ -75,12 +70,12 @@ public class SecondActivity extends AppCompatActivity {
}
private void restoreValues() {
TextView secondFirstNameEditText = findViewById(R.id.secondFirstNameEditText);
TextView secondLastNameEditText = findViewById(R.id.secondLastNameEditText);
TextView secondBirthCityEditText = findViewById(R.id.secondBirthCityEditText);
TextView secondBirthDeptSpinner = findViewById(R.id.secondBirthDeptSpinner);
TextView secondBirthDateEditText = findViewById(R.id.secondBirthDateEditText);
LinearLayout secondPhonesLayout = findViewById(R.id.secondPhonesLayout);
TextView secondFirstNameEditText = findViewById(R.id.displayFirstNameTextView);
TextView secondLastNameEditText = findViewById(R.id.displayLastNameTextView);
TextView secondBirthCityEditText = findViewById(R.id.displayBirthDateTextView);
TextView secondBirthDeptSpinner = findViewById(R.id.displayBirthDeptTextView);
TextView secondBirthDateEditText = findViewById(R.id.displayBirthCityTextView);
LinearLayout secondPhonesLayout = findViewById(R.id.displayPhonesLayout);
secondFirstNameEditText.setText(firstName);
secondLastNameEditText.setText(lastName);
......@@ -160,14 +155,14 @@ public class SecondActivity extends AppCompatActivity {
.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Toast.makeText(SecondActivity.this, "Permission Denied", Toast.LENGTH_SHORT)
Toast.makeText(DisplayUserActivity.this, "Permission Denied", Toast.LENGTH_SHORT)
.show();
}
})
.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ActivityCompat.requestPermissions(SecondActivity.this, new String[]{Manifest.permission.CALL_PHONE}, 3); // 3 is requestCode and can be any number
ActivityCompat.requestPermissions(DisplayUserActivity.this, new String[]{Manifest.permission.CALL_PHONE}, 3); // 3 is requestCode and can be any number
}
})
.create()
......
app/src/main/java/fr/imt_atlantique/myfirstapplication/MainActivity.java
+ 1
− 1
View file @ 6593c91a
......@@ -188,7 +188,7 @@ public class MainActivity extends AppCompatActivity {
// Creating the intent for the second activity with the User infos
Intent intent = new Intent(this, SecondActivity.class);
Intent intent = new Intent(this, DisplayUserActivity.class);
LocalDate parsedBirthDate = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy");
......
app/src/main/res/layout/activity_second.xml → app/src/main/res/layout/activity_display_user.xml
+ 12
− 24
View file @ 6593c91a
......@@ -3,7 +3,7 @@
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:id="@+id/second"
android:id="@+id/displayUserActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
......@@ -26,14 +26,14 @@
android:padding="16dp">
<TextView
android:id="@+id/secondFirstNameTextView"
android:id="@+id/displayFirstNameTextViewLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/first_name_label" />
<TextView
android:id="@+id/secondFirstNameEditText"
android:id="@+id/displayFirstNameTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -54,14 +54,14 @@
android:padding="16dp">
<TextView
android:id="@+id/secondLastNameTextView"
android:id="@+id/displayLastNameTextViewLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/last_name_label" />
<TextView
android:id="@+id/secondLastNameEditText"
android:id="@+id/displayLastNameTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -70,7 +70,6 @@
android:ems="10"
android:gravity="center"
android:hint="@string/last_name_placeholder"
android:inputType="text"
android:minHeight="48dp"
android:text="@string/last_name_label" />
</LinearLayout>
......@@ -82,14 +81,14 @@
android:padding="16dp">
<TextView
android:id="@+id/secondBirthDateTextView"
android:id="@+id/displayBirthDateTextViewLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/birth_date_label" />
<TextView
android:id="@+id/secondBirthDateEditText"
android:id="@+id/displayBirthDateTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -97,8 +96,6 @@
android:background="@drawable/rounded_edittext"
android:ems="10"
android:gravity="center"
android:hint="No date"
android:inputType="text"
android:minHeight="48dp" />
</LinearLayout>
......@@ -110,14 +107,14 @@
android:padding="16dp">
<TextView
android:id="@+id/secondBirthDeptTextView"
android:id="@+id/displayBirthDeptTextViewLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/birth_dept_label" />
<TextView
android:id="@+id/secondBirthDeptSpinner"
android:id="@+id/displayBirthDeptTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -126,7 +123,6 @@
android:ems="10"
android:gravity="center"
android:entries="@array/departments"
android:text="No department"
android:minHeight="48dp"/>
</LinearLayout>
......@@ -138,14 +134,14 @@
android:padding="16dp">
<TextView
android:id="@+id/secondBirthCityTextView"
android:id="@+id/displayBirthCityTextViewLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/birth_city_label" />
<TextView
android:id="@+id/secondBirthCityEditText"
android:id="@+id/displayBirthCityTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -154,13 +150,12 @@
android:ems="10"
android:gravity="center"
android:hint="@string/birth_city_placeholder"
android:inputType="text"
android:minHeight="48dp"
android:text="@string/birth_city_placeholder" />
</LinearLayout>
<LinearLayout
android:id="@+id/secondPhonesLayout"
android:id="@+id/displayPhonesLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
......@@ -171,13 +166,6 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp">
<TextView
android:id="@+id/addAPhoneNumberTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/add_phone_number_label" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment