Skip to content
This repository was archived by the owner on Jun 28, 2022. It is now read-only.

Move attribute android:scaleType from FrameLayouts to ImageView. #7

Open
wants to merge 1 commit into
base: develop_branch
Choose a base branch
from
Open

Move attribute android:scaleType from FrameLayouts to ImageView. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions app/src/main/res/layout-sw600dp/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,17 @@
<FrameLayout
android:id="@+id/head_container"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
android:layout_height="180dp" />

<FrameLayout
android:id="@+id/body_container"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
android:layout_height="180dp" />

<FrameLayout
android:id="@+id/leg_container"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
android:layout_height="180dp" />


</LinearLayout>
Expand Down
26 changes: 12 additions & 14 deletions app/src/main/res/layout/activity_android_me.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Copyright (C) 2017 The Android Open Source Project
<?xml version="1.0" encoding="utf-8"?><!--Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Expand All @@ -10,8 +9,7 @@
See the License for the specific language governing permissions and
limitations under the License.-->

<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -32,21 +30,21 @@

<!-- Three containers for each Android-Me body part -->
<!-- This container holds the head BodyPartFragment of the custom Android-Me image -->
<FrameLayout android:id="@+id/head_container"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
<FrameLayout
android:id="@+id/head_container"
android:layout_width="match_parent"
android:layout_height="180dp" />

<!-- The remaining containers for the body and leg BodyPartFragments -->
<FrameLayout android:id="@+id/body_container"
<FrameLayout
android:id="@+id/body_container"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
android:layout_height="180dp" />

<FrameLayout android:id="@+id/leg_container"
<FrameLayout
android:id="@+id/leg_container"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
android:layout_height="180dp" />


</LinearLayout>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/layout/fragment_body_part.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/body_part_image_view"
android:layout_width="match_parent"
android:layout_height="match_parent">

</ImageView>
android:layout_height="match_parent"
android:scaleType="centerInside"/>