forked from distok/cutthecord
		
	28-alpha2 (1167)
This commit is contained in:
		
							parent
							
								
									b21564104e
								
							
						
					
					
						commit
						13e2bea520
					
				
					 50 changed files with 58994 additions and 140 deletions
				
			
		
							
								
								
									
										69
									
								
								patches/nocamerabutton/1167.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										69
									
								
								patches/nocamerabutton/1167.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,69 @@
 | 
			
		|||
diff -crB from/res/layout/flex_input_widget.xml to/res/layout/flex_input_widget.xml
 | 
			
		||||
*** from/res/layout/flex_input_widget.xml	2020-06-20 04:18:48.593394410 +0100
 | 
			
		||||
--- to/res/layout/flex_input_widget.xml	2020-06-20 04:20:25.034694444 +0100
 | 
			
		||||
***************
 | 
			
		||||
*** 8,14 ****
 | 
			
		||||
      <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
 | 
			
		||||
          <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
 | 
			
		||||
              <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
 | 
			
		||||
!             <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
 | 
			
		||||
              <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
 | 
			
		||||
          </LinearLayout>
 | 
			
		||||
          <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
 | 
			
		||||
--- 8,14 ----
 | 
			
		||||
      <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
 | 
			
		||||
          <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
 | 
			
		||||
              <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
 | 
			
		||||
!             <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:visibility="gone" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
 | 
			
		||||
              <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
 | 
			
		||||
          </LinearLayout>
 | 
			
		||||
          <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
 | 
			
		||||
***************
 | 
			
		||||
*** 22,25 ****
 | 
			
		||||
      </RelativeLayout>
 | 
			
		||||
      <FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
 | 
			
		||||
      <FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
 | 
			
		||||
! </LinearLayout>
 | 
			
		||||
\ No newline at end of file
 | 
			
		||||
--- 22,25 ----
 | 
			
		||||
      </RelativeLayout>
 | 
			
		||||
      <FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
 | 
			
		||||
      <FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
 | 
			
		||||
! </LinearLayout>
 | 
			
		||||
diff -crB from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
 | 
			
		||||
*** from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-06-20 04:18:53.511358449 +0100
 | 
			
		||||
--- to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-06-20 04:36:17.584111077 +0100
 | 
			
		||||
***************
 | 
			
		||||
*** 353,359 ****
 | 
			
		||||
  
 | 
			
		||||
      if-eqz v5, :cond_5
 | 
			
		||||
  
 | 
			
		||||
!     const/4 v10, 0x0
 | 
			
		||||
  
 | 
			
		||||
      goto :goto_2
 | 
			
		||||
  
 | 
			
		||||
--- 353,359 ----
 | 
			
		||||
  
 | 
			
		||||
      if-eqz v5, :cond_5
 | 
			
		||||
  
 | 
			
		||||
!     const/16 v10, 0x0
 | 
			
		||||
  
 | 
			
		||||
      goto :goto_2
 | 
			
		||||
  
 | 
			
		||||
***************
 | 
			
		||||
*** 508,514 ****
 | 
			
		||||
  
 | 
			
		||||
      if-eqz v5, :cond_e
 | 
			
		||||
  
 | 
			
		||||
!     const/4 v10, 0x0
 | 
			
		||||
  
 | 
			
		||||
      goto :goto_9
 | 
			
		||||
  
 | 
			
		||||
--- 508,514 ----
 | 
			
		||||
  
 | 
			
		||||
      if-eqz v5, :cond_e
 | 
			
		||||
  
 | 
			
		||||
!     const/16 v10, 0x8
 | 
			
		||||
  
 | 
			
		||||
      goto :goto_9
 | 
			
		||||
  
 | 
			
		||||
| 
						 | 
				
			
			@ -66,4 +66,5 @@ to
 | 
			
		|||
- 23.0
 | 
			
		||||
- 24-alpha2
 | 
			
		||||
- 24
 | 
			
		||||
- 28-alpha2
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue