Merge pull request #192 from Pierre977/master

Add support clickable web link
heinrichreimer · Mar 13, 2017 · 615fdf3 · 615fdf3
2 parents 1209036 + 5e85116
commit 615fdf3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/library/src/main/res/layout-land/mi_fragment_simple_slide.xml b/library/src/main/res/layout-land/mi_fragment_simple_slide.xml
@@ -18,16 +18,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:gravity="center"
             android:adjustViewBounds="true"
+            android:gravity="center"
             tools:ignore="ContentDescription"
-            tools:src="@android:drawable/sym_action_call"/>
+            tools:src="@android:drawable/sym_action_call" />
 
     </FrameLayout>
 
     <android.support.v4.widget.Space
         android:layout_width="@dimen/mi_baseline"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <LinearLayout
         android:layout_width="0dp"
@@ -40,20 +40,22 @@
             android:id="@id/mi_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
             android:gravity="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-            android:fontFamily="sans-serif-medium"
             tools:ignore="UnusedAttribute"
-            tools:text="Lorem ipsum"/>
+            tools:text="Lorem ipsum" />
 
         <TextView
             android:id="@id/mi_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/mi_baseline"
+            android:autoLink="web"
             android:gravity="center"
+            android:linksClickable="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …"/>
+            tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />
 
     </LinearLayout>
 

diff --git a/library/src/main/res/layout-land/mi_fragment_simple_slide_scrollable.xml b/library/src/main/res/layout-land/mi_fragment_simple_slide_scrollable.xml
@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:padding="@dimen/mi_baseline"
     android:clipToPadding="false"
-    android:fitsSystemWindows="false">
+    android:fitsSystemWindows="false"
+    android:padding="@dimen/mi_baseline">
 
     <FrameLayout
         android:layout_width="0dp"
@@ -18,16 +18,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:gravity="center"
             android:adjustViewBounds="true"
+            android:gravity="center"
             tools:ignore="ContentDescription"
-            tools:src="@android:drawable/sym_action_call"/>
+            tools:src="@android:drawable/sym_action_call" />
 
     </FrameLayout>
 
     <android.support.v4.widget.Space
         android:layout_width="@dimen/mi_baseline"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <ScrollView
         android:layout_width="0dp"
@@ -46,20 +46,22 @@
                 android:id="@id/mi_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:fontFamily="sans-serif-medium"
                 tools:ignore="UnusedAttribute"
-                tools:text="Lorem ipsum"/>
+                tools:text="Lorem ipsum" />
 
             <TextView
                 android:id="@id/mi_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/mi_baseline"
+                android:autoLink="web"
                 android:gravity="center"
+                android:linksClickable="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …"/>
+                tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />
 
         </LinearLayout>
 

diff --git a/library/src/main/res/layout/mi_fragment_simple_slide.xml b/library/src/main/res/layout/mi_fragment_simple_slide.xml
@@ -14,19 +14,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/mi_baseline"
-        android:gravity="center"
         android:adjustViewBounds="true"
+        android:gravity="center"
         tools:ignore="ContentDescription"
-        tools:src="@android:drawable/sym_action_call"/>
+        tools:src="@android:drawable/sym_action_call" />
 
     <TextView
         android:id="@id/mi_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/mi_baseline"
+        android:fontFamily="sans-serif-medium"
         android:gravity="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-        android:fontFamily="sans-serif-medium"
         tools:ignore="UnusedAttribute"
         tools:text="Lorem ipsum" />
 
@@ -35,7 +35,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/mi_baseline"
+        android:autoLink="web"
         android:gravity="center"
+        android:linksClickable="true"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />
 

diff --git a/library/src/main/res/layout/mi_fragment_simple_slide_scrollable.xml b/library/src/main/res/layout/mi_fragment_simple_slide_scrollable.xml
@@ -19,19 +19,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/mi_baseline"
-            android:gravity="center"
             android:adjustViewBounds="true"
+            android:gravity="center"
             tools:ignore="ContentDescription"
-            tools:src="@android:drawable/sym_action_call"/>
+            tools:src="@android:drawable/sym_action_call" />
 
         <TextView
             android:id="@id/mi_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/mi_baseline"
+            android:fontFamily="sans-serif-medium"
             android:gravity="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-            android:fontFamily="sans-serif-medium"
             tools:ignore="UnusedAttribute"
             tools:text="Lorem ipsum" />
 
@@ -40,7 +40,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/mi_baseline"
+            android:autoLink="web"
             android:gravity="center"
+            android:linksClickable="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />