Commit 479cda19 by Patryk Czarnik

Poprawki w Projekt 3

parent 99cc7cb3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
......
...@@ -13,9 +13,11 @@ import androidx.core.view.ViewCompat; ...@@ -13,9 +13,11 @@ import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsCompat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity"; private static final String TAG = "MainActivity";
private static final DateTimeFormatter FORMAT_DATY = DateTimeFormatter.ofPattern("d.M.yyyy HH:mm:ss");
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -29,14 +31,15 @@ public class MainActivity extends AppCompatActivity { ...@@ -29,14 +31,15 @@ public class MainActivity extends AppCompatActivity {
}); });
} }
// metoda, którą wskauzjemy w onClick, musi być publiczna i przyjmować parametr typu View
public void klik1(View view) { public void klik1(View view) {
Toast.makeText(this, "Hej, tu guzik 1", Toast.LENGTH_LONG).show(); Toast.makeText(this, "Hej, tu guzik 1", Toast.LENGTH_LONG).show();
Log.d(TAG, "klik1: tak, tak, działa"); Log.d(TAG, "klik1: tak, tak, działa");
} }
public void pokazCzas(View view) { public void pokazCzas(View view) {
String dt = LocalDateTime.now().toString(); String dt = LocalDateTime.now().format(FORMAT_DATY);
TextView textView = findViewById(R.id.textView); TextView textView = findViewById(R.id.textViewMain);
textView.setText(dt); textView.setText(dt);
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
tools:context=".MainActivity"> tools:context=".MainActivity">
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textViewMain"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Hello World!" android:text="Hello World!"
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
app:layout_constraintVertical_bias="0.3" /> app:layout_constraintVertical_bias="0.3" />
<Button <Button
android:id="@+id/button" android:id="@+id/button1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:onClick="klik1" android:onClick="klik1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView" /> app:layout_constraintTop_toBottomOf="@+id/textViewMain" />
<Button <Button
android:id="@+id/button2" android:id="@+id/button2"
...@@ -38,6 +38,6 @@ ...@@ -38,6 +38,6 @@
android:text="Pokaż czas" android:text="Pokaż czas"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button" /> app:layout_constraintTop_toBottomOf="@+id/button1" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment