Skip to content

Improved layout hierarchy #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ignasi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improved layout hierarchy #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f8bebd
Fixed imports
ignasi Aug 22, 2014
f81c4ce
Removed 2 unneeded levels of hierarchy
ignasi Aug 22, 2014
971480c
Changed LinearLayout and RelativeLayout to FrameLayout
ignasi Aug 22, 2014
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
6 changes: 4 additions & 2 deletions library/FlipCheckBox/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry kind="lib" path="libs/nineoldandroids-2.4.0.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
20 changes: 7 additions & 13 deletions library/FlipCheckBox/res/layout/flipcheckbox_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >

<ViewFlipper
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<include android:id="@+id/inclide_front" layout="@layout/simple_card_front" />
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<include android:id="@+id/inclide_back" layout="@layout/simple_card_back" />
</ViewFlipper>
<include android:id="@+id/inclide_front" layout="@layout/simple_card_front" />

</LinearLayout>
<include android:id="@+id/inclide_back" layout="@layout/simple_card_back" />
</merge>
6 changes: 3 additions & 3 deletions library/FlipCheckBox/res/layout/simple_card_back.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
Expand All @@ -9,9 +9,9 @@
android:id="@+id/iv__card_back__ok"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:contentDescription="@null"
android:gravity="center_horizontal"
android:src="@drawable/ic_action_accept" />

</RelativeLayout>
</FrameLayout>
4 changes: 2 additions & 2 deletions library/FlipCheckBox/res/layout/simple_card_front.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/darker_gray"
android:orientation="vertical" >

</LinearLayout>
</FrameLayout>
5 changes: 2 additions & 3 deletions library/FlipCheckBox/src/com/franlopez/flipcheckbox/FlipCheckBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import android.view.View;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ViewFlipper;

/**
Expand All @@ -26,7 +25,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
and limitations under the License.
*/
public class FlipCheckBox extends LinearLayout {
public class FlipCheckBox extends ViewFlipper {

/**
* Status available
Expand Down Expand Up @@ -88,7 +87,7 @@ public FlipCheckBox(Context context, AttributeSet attrs) {

private void getView(View view) {

mViewFlipper = (ViewFlipper) view.findViewById(R.id.viewFlipper);
mViewFlipper = (ViewFlipper) view;
mIVOk = (ImageView) mViewFlipper.findViewById(R.id.inclide_back).findViewById(R.id.iv__card_back__ok);
}

Expand Down
7 changes: 2 additions & 5 deletions sample/Demo FlipCheckBox/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="lib" path="libs/android-support-v7-appcompat.jar"/>
<classpathentry kind="lib" path="libs/picasso-2.3.2.jar"/>
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/android-support-v7-appcompat"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
Binary file removed sample/Demo FlipCheckBox/libs/android-support-v4.jar
View file
Open in desktop
Binary file not shown.
Binary file removed sample/Demo FlipCheckBox/libs/android-support-v7-appcompat.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sample/Demo FlipCheckBox/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# Project target.
target=android-19
android.library.reference.1=../../library/FlipCheckBox
android.library.reference.2=../../../../adt-bundle-mac-x86_64-ultima-version/sdk/extras/android/support/v7/appcompat
android.library.reference.2=../../../android-sdk/extras/android/support/v7/appcompat