Compare commits

..

No commits in common. "9aaf27e309a2138c8ef7fb7470fbff5cd2915f53" and "1a116d0b262e5f58b1f4fa2789236ee13a360c87" have entirely different histories.

3 changed files with 16 additions and 22 deletions

View File

@ -1,49 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
tools:context=".MainActivity"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.MyWeather.AppBarOverlay"
app:layout_constraintBottom_toTopOf="parent">
android:theme="@style/Theme.MyWeather.AppBarOverlay">
</com.google.android.material.appbar.AppBarLayout>
<ImageView
android:id="@+id/imageView"
android:layout_width="388dp"
android:layout_height="461dp"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_width="match_parent"
android:layout_height="530dp"
app:srcCompat="@drawable/ic_baseline_umbrella_24" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="51dp"
android:gravity="center"
android:text="@string/firstAction"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/fab"
tools:layout_editor_absoluteX="89dp" />
android:gravity="center"
android:layout_marginRight="10dp"
android:layout_marginLeft="10dp"
android:text="Please click on the 'Add' button in order to add a city"
tools:layout_editor_absoluteX="89dp"
tools:layout_editor_absoluteY="566dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
app:backgroundTint="#FF0202"
app:rippleColor="#FFFFFF"
app:srcCompat="@android:drawable/ic_input_add"/>
app:srcCompat="@android:drawable/ic_input_add" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

View File

@ -10,8 +10,4 @@
<string name="hello_first_fragment">Hello first fragment</string>
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
<string name="title_activity_main2">MainActivity</string>
<string name="title_activity_test_constraint_layout">TestConstraintLayout</string>
<string name="firstAction">Please click on the Add button in order to add a city</string>
</resources>

View File

@ -6,6 +6,7 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:4.1.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}