mirror of
				https://codeberg.org/tom79/Fedilab.git
				synced 2025-10-20 11:20:16 +03:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						77f22390e1
					
				
					 1 changed files with 31 additions and 26 deletions
				
			
		| 
						 | 
					@ -4,41 +4,46 @@
 | 
				
			||||||
    android:id="@+id/fetch_more_container"
 | 
					    android:id="@+id/fetch_more_container"
 | 
				
			||||||
    android:layout_width="match_parent"
 | 
					    android:layout_width="match_parent"
 | 
				
			||||||
    android:layout_height="wrap_content"
 | 
					    android:layout_height="wrap_content"
 | 
				
			||||||
    android:layout_gravity="center"
 | 
					    android:gravity="center_horizontal"
 | 
				
			||||||
    android:orientation="horizontal"
 | 
					    android:orientation="vertical"
 | 
				
			||||||
    android:paddingHorizontal="6dp">
 | 
					    android:paddingHorizontal="6dp">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <com.google.android.material.button.MaterialButton
 | 
					    <com.google.android.material.divider.MaterialDivider
 | 
				
			||||||
        android:id="@+id/fetch_more_min"
 | 
					        android:layout_width="match_parent"
 | 
				
			||||||
        style="@style/Widget.App.Button.IconOnly.Outline"
 | 
					        android:layout_height="1dp" />
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					 | 
				
			||||||
        android:layout_marginHorizontal="6dp"
 | 
					 | 
				
			||||||
        android:layout_marginTop="6dp"
 | 
					 | 
				
			||||||
        android:contentDescription="@string/fetch_more_messages"
 | 
					 | 
				
			||||||
        app:icon="@drawable/ic_fetch_more_arrow_upward"
 | 
					 | 
				
			||||||
        app:iconPadding="0dp" />
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <androidx.appcompat.widget.AppCompatTextView
 | 
					 | 
				
			||||||
        android:layout_width="0dp"
 | 
					 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					 | 
				
			||||||
        android:layout_gravity="center"
 | 
					 | 
				
			||||||
        android:layout_margin="6dp"
 | 
					 | 
				
			||||||
        android:layout_weight="1"
 | 
					 | 
				
			||||||
        android:text="@string/fetch_more_messages"
 | 
					 | 
				
			||||||
        android:textAlignment="center"
 | 
					 | 
				
			||||||
        android:textColor="?colorAccent"
 | 
					 | 
				
			||||||
        android:textSize="18sp" />
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <com.google.android.material.button.MaterialButton
 | 
					    <com.google.android.material.button.MaterialButton
 | 
				
			||||||
        android:id="@+id/fetch_more_max"
 | 
					        android:id="@+id/fetch_more_max"
 | 
				
			||||||
        style="@style/Widget.App.Button.IconOnly.Outline"
 | 
					        style="@style/Widget.App.Button.IconOnly.Outline"
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
        android:layout_marginHorizontal="6dp"
 | 
					        android:layout_marginTop="6dp"
 | 
				
			||||||
        android:layout_marginBottom="6dp"
 | 
					 | 
				
			||||||
        android:contentDescription="@string/fetch_more_messages"
 | 
					        android:contentDescription="@string/fetch_more_messages"
 | 
				
			||||||
        app:icon="@drawable/ic_fetch_more_arrow_downward"
 | 
					        app:icon="@drawable/ic_fetch_more_arrow_downward"
 | 
				
			||||||
        app:iconPadding="0dp" />
 | 
					        app:iconPadding="0dp"
 | 
				
			||||||
 | 
					        app:iconTint="?android:textColorPrimary"
 | 
				
			||||||
 | 
					        app:strokeColor="?android:textColorPrimary" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <androidx.appcompat.widget.AppCompatTextView
 | 
				
			||||||
 | 
					        android:layout_width="match_parent"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_gravity="center"
 | 
				
			||||||
 | 
					        android:layout_marginVertical="24dp"
 | 
				
			||||||
 | 
					        android:text="@string/fetch_more_messages"
 | 
				
			||||||
 | 
					        android:textAlignment="center"
 | 
				
			||||||
 | 
					        android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
 | 
				
			||||||
 | 
					        android:textSize="18sp"
 | 
				
			||||||
 | 
					        app:textAllCaps="false" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <com.google.android.material.button.MaterialButton
 | 
				
			||||||
 | 
					        android:id="@+id/fetch_more_min"
 | 
				
			||||||
 | 
					        style="@style/Widget.App.Button.IconOnly.Outline"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:contentDescription="@string/fetch_more_messages"
 | 
				
			||||||
 | 
					        app:icon="@drawable/ic_fetch_more_arrow_upward"
 | 
				
			||||||
 | 
					        app:iconPadding="0dp"
 | 
				
			||||||
 | 
					        app:iconTint="?android:textColorPrimary"
 | 
				
			||||||
 | 
					        app:strokeColor="?android:textColorPrimary" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</androidx.appcompat.widget.LinearLayoutCompat>
 | 
					</androidx.appcompat.widget.LinearLayoutCompat>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue