Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions app/src/main/res/layout/activity_android_history.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,57 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.constraintlayout.widget.ConstraintLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_history"
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/history"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:textColor="?attr/colorSecondary" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_android_history"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/summary_android_history"
app:layout_constraintTop_toBottomOf="@id/text_view_history"
tools:ignore="VisualLintLongText" />

<com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
android:id="@+id/ad_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
app:layout_constraintTop_toBottomOf="@id/text_view_android_history" />
android:layout_marginTop="24dp" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_features"
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/features"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ad_view" />
android:textColor="?attr/colorSecondary" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_android_features"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/summary_android_features"
app:layout_constraintTop_toBottomOf="@id/text_view_features"
tools:ignore="VisualLintLongText" />

<com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
android:id="@+id/ad_view_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_android_features" />
</androidx.constraintlayout.widget.ConstraintLayout>
</me.zhanghai.android.fastscroll.FastScrollScrollView>
android:layout_marginTop="24dp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</me.zhanghai.android.fastscroll.FastScrollScrollView>
26 changes: 9 additions & 17 deletions app/src/main/res/layout/activity_android_sdk.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,24 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.constraintlayout.widget.ConstraintLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="24dp"
app:layout_constraintBottom_toTopOf="@+id/tableRow"
app:layout_constraintTop_toTopOf="@+id/tableRow">
android:orientation="vertical"
android:padding="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_android_sdks_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/summary_sdk"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="VisualLintLongText" />

<com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
android:id="@+id/ad_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:layout_constraintTop_toBottomOf="@id/text_view_android_sdks_summary" />
android:layout_marginTop="24dp" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_android"
Expand All @@ -36,17 +32,14 @@
android:layout_height="wrap_content"
android:paddingTop="24dp"
android:text="@string/android_versions"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ad_view"
tools:ignore="HardcodedText,TextContrastCheck" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/card_view_table_layout"
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="24dp"
app:layout_constraintTop_toBottomOf="@id/text_view_android">
android:layout_height="wrap_content"
app:cardCornerRadius="24dp">

<TableLayout
android:id="@+id/table_layout"
Expand All @@ -64,7 +57,6 @@
android:id="@+id/ad_view_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:layout_constraintTop_toBottomOf="@id/card_view_table_layout" />
</androidx.constraintlayout.widget.ConstraintLayout>
</me.zhanghai.android.fastscroll.FastScrollScrollView>
android:layout_marginTop="24dp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</me.zhanghai.android.fastscroll.FastScrollScrollView>
69 changes: 24 additions & 45 deletions app/src/main/res/layout/activity_android_start_project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,40 +26,36 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_app_bar">

<androidx.constraintlayout.widget.ConstraintLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_first_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/step1"
android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:textColor="?attr/colorSecondary" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_first_step_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/summary_first_step"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_first_step" />
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/card_view_first_step"
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_margin="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_first_step_summary"
android:layout_marginTop="24dp"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">

<androidx.appcompat.widget.AppCompatImageView
Expand All @@ -76,39 +72,31 @@
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
ads:adSize="MEDIUM_RECTANGLE"
ads:adUnitId="@string/ad_banner_unit_id"
app:layout_constraintTop_toBottomOf="@id/card_view_first_step" />
ads:adUnitId="@string/ad_banner_unit_id" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_second_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/step2"
android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ad_view" />
android:textColor="?attr/colorSecondary" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_second_step_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/summary_second_step"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_second_step" />
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/card_view_second_step"
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_margin="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_second_step_summary"
android:layout_marginTop="24dp"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">

<androidx.appcompat.widget.AppCompatImageView
Expand All @@ -123,32 +111,25 @@
android:id="@+id/text_view_third_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/step3"
android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_view_second_step" />
android:textColor="?attr/colorSecondary" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_third_step_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/summary_third_step"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_third_step" />
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/card_view_third_step"
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_margin="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_third_step_summary"
android:layout_marginTop="24dp"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">

<androidx.appcompat.widget.AppCompatImageView
Expand All @@ -163,7 +144,6 @@
android:id="@+id/lottie_animation"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/card_view_third_step"
app:lottie_autoPlay="true"
app:lottie_loop="false"
app:lottie_rawRes="@raw/anim_programmer"
Expand All @@ -173,10 +153,9 @@
android:id="@+id/ad_view_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
ads:adSize="LARGE_BANNER"
ads:adUnitId="@string/ad_banner_unit_id"
app:layout_constraintTop_toBottomOf="@id/lottie_animation" />
</androidx.constraintlayout.widget.ConstraintLayout>
ads:adUnitId="@string/ad_banner_unit_id" />
</androidx.appcompat.widget.LinearLayoutCompat>
</me.zhanghai.android.fastscroll.FastScrollScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_clock.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<com.google.android.material.textview.MaterialTextView
Expand Down Expand Up @@ -106,4 +106,4 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:targetApi="26" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>