Merge pull request #4 from seniorquico/close-icon

Replaced "Close" text with double left chevron icon DEV-314
ZapicInc · Feb 15, 2018 · 3d56405 · 3d56405
2 parents 833cb97 + 915b52f
commit 3d56405
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 12 deletions.
diff --git a/zapic/src/main/java/com/zapic/android/sdk/LoadingPageFragment.java b/zapic/src/main/java/com/zapic/android/sdk/LoadingPageFragment.java
@@ -8,7 +8,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
+import android.widget.ImageButton;
 
 /**
  * A {@link Fragment} that renders a loading page.
@@ -65,7 +65,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        Button closeButton = view.findViewById(R.id.fragment_page_loading_close);
+        ImageButton closeButton = view.findViewById(R.id.fragment_page_loading_close);
         closeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/zapic/src/main/java/com/zapic/android/sdk/OfflinePageFragment.java b/zapic/src/main/java/com/zapic/android/sdk/OfflinePageFragment.java
@@ -8,7 +8,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
+import android.widget.ImageButton;
 
 /**
  * A {@link Fragment} that renders an offline page.
@@ -65,7 +65,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        Button closeButton = view.findViewById(R.id.fragment_page_offline_close);
+        ImageButton closeButton = view.findViewById(R.id.fragment_page_offline_close);
         closeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/zapic/src/main/res/drawable-hdpi-v4/ic_keyboard_backspace_black_24dp.png b/zapic/src/main/res/drawable-hdpi-v4/ic_keyboard_backspace_black_24dp.png
diff --git a/zapic/src/main/res/drawable-hdpi/chevron_double_left.png b/zapic/src/main/res/drawable-hdpi/chevron_double_left.png
diff --git a/zapic/src/main/res/drawable-hdpi-v4/logo.png → zapic/src/main/res/drawable-hdpi/logo.png b/zapic/src/main/res/drawable-hdpi-v4/logo.png → zapic/src/main/res/drawable-hdpi/logo.png
diff --git a/zapic/src/main/res/drawable-ldpi-v4/ic_keyboard_backspace_black_24dp.png b/zapic/src/main/res/drawable-ldpi-v4/ic_keyboard_backspace_black_24dp.png
diff --git a/zapic/src/main/res/drawable-ldpi-v4/logo.png → zapic/src/main/res/drawable-ldpi/logo.png b/zapic/src/main/res/drawable-ldpi-v4/logo.png → zapic/src/main/res/drawable-ldpi/logo.png
diff --git a/zapic/src/main/res/drawable-mdpi-v4/ic_keyboard_backspace_black_24dp.png b/zapic/src/main/res/drawable-mdpi-v4/ic_keyboard_backspace_black_24dp.png
diff --git a/zapic/src/main/res/drawable-mdpi/chevron_double_left.png b/zapic/src/main/res/drawable-mdpi/chevron_double_left.png
diff --git a/zapic/src/main/res/drawable-mdpi-v4/logo.png → zapic/src/main/res/drawable-mdpi/logo.png b/zapic/src/main/res/drawable-mdpi-v4/logo.png → zapic/src/main/res/drawable-mdpi/logo.png
diff --git a/zapic/src/main/res/drawable-xhdpi-v4/ic_keyboard_backspace_black_24dp.png b/zapic/src/main/res/drawable-xhdpi-v4/ic_keyboard_backspace_black_24dp.png
diff --git a/zapic/src/main/res/drawable-xhdpi/chevron_double_left.png b/zapic/src/main/res/drawable-xhdpi/chevron_double_left.png
diff --git a/...c/src/main/res/drawable-xhdpi-v4/logo.png → zapic/src/main/res/drawable-xhdpi/logo.png b/...c/src/main/res/drawable-xhdpi-v4/logo.png → zapic/src/main/res/drawable-xhdpi/logo.png
diff --git a/zapic/src/main/res/drawable-xxhdpi-v4/ic_keyboard_backspace_black_24dp.png b/zapic/src/main/res/drawable-xxhdpi-v4/ic_keyboard_backspace_black_24dp.png
diff --git a/zapic/src/main/res/drawable-xxhdpi/chevron_double_left.png b/zapic/src/main/res/drawable-xxhdpi/chevron_double_left.png
diff --git a/.../src/main/res/drawable-xxhdpi-v4/logo.png → zapic/src/main/res/drawable-xxhdpi/logo.png b/.../src/main/res/drawable-xxhdpi-v4/logo.png → zapic/src/main/res/drawable-xxhdpi/logo.png
diff --git a/zapic/src/main/res/drawable-xxxhdpi-v4/ic_keyboard_backspace_black_24dp.png b/zapic/src/main/res/drawable-xxxhdpi-v4/ic_keyboard_backspace_black_24dp.png
diff --git a/zapic/src/main/res/drawable-xxxhdpi/chevron_double_left.png b/zapic/src/main/res/drawable-xxxhdpi/chevron_double_left.png
diff --git a/...src/main/res/drawable-xxxhdpi-v4/logo.png → zapic/src/main/res/drawable-xxxhdpi/logo.png b/...src/main/res/drawable-xxxhdpi-v4/logo.png → zapic/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/zapic/src/main/res/layout-land/fragment_page_offline.xml b/zapic/src/main/res/layout-land/fragment_page_offline.xml
@@ -5,13 +5,17 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     tools:context="com.zapic.android.sdk.OfflinePageFragment">
-    <Button
+    <ImageButton
         android:id="@+id/fragment_page_offline_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:text="@string/fragment_page_offline_close" />
+        android:layout_marginStart="@dimen/margin"
+        android:layout_marginTop="@dimen/margin"
+        android:background="?android:selectableItemBackground"
+        android:contentDescription="@string/fragment_page_offline_close"
+        android:src="@drawable/chevron_double_left" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/zapic/src/main/res/layout-v21/fragment_page_loading.xml b/zapic/src/main/res/layout-v21/fragment_page_loading.xml
@@ -4,13 +4,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.zapic.android.sdk.LoadingPageFragment">
-    <Button
+    <ImageButton
         android:id="@+id/fragment_page_loading_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:text="@string/fragment_page_loading_close" />
+        android:layout_marginStart="@dimen/margin"
+        android:layout_marginTop="@dimen/margin"
+        android:background="?android:selectableItemBackground"
+        android:contentDescription="@string/fragment_page_loading_close"
+        android:src="@drawable/chevron_double_left" />
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/zapic/src/main/res/layout/fragment_page_loading.xml b/zapic/src/main/res/layout/fragment_page_loading.xml
@@ -4,13 +4,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.zapic.android.sdk.LoadingPageFragment">
-    <Button
+    <ImageButton
         android:id="@+id/fragment_page_loading_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:text="@string/fragment_page_loading_close" />
+        android:layout_marginStart="@dimen/margin"
+        android:layout_marginTop="@dimen/margin"
+        android:background="?android:selectableItemBackground"
+        android:contentDescription="@string/fragment_page_loading_close"
+        android:src="@drawable/chevron_double_left" />
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/zapic/src/main/res/layout/fragment_page_offline.xml b/zapic/src/main/res/layout/fragment_page_offline.xml
@@ -5,13 +5,17 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     tools:context="com.zapic.android.sdk.OfflinePageFragment">
-    <Button
+    <ImageButton
         android:id="@+id/fragment_page_offline_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:text="@string/fragment_page_offline_close" />
+        android:layout_marginStart="@dimen/margin"
+        android:layout_marginTop="@dimen/margin"
+        android:background="?android:selectableItemBackground"
+        android:contentDescription="@string/fragment_page_offline_close"
+        android:src="@drawable/chevron_double_left" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"