Ryan Harg
3 years ago
9 changed files with 219 additions and 216 deletions
After Width: | Height: | Size: 18 KiB |
@ -1,8 +1,8 @@
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> |
||||
|
||||
<item android:color="@android:color/white" android:state_focused="true" /> |
||||
<item android:color="@android:color/white" android:state_hovered="true" /> |
||||
<item android:color="@android:color/white" /> |
||||
<item android:color="@color/controlColorHintText" android:state_focused="true" /> |
||||
<item android:color="@color/controlColorHintText" android:state_hovered="true" /> |
||||
<item android:color="@color/controlColorHintText" /> |
||||
|
||||
</selector> |
||||
</selector> |
||||
|
@ -1,132 +1,131 @@
@@ -1,132 +1,131 @@
|
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:background="@color/colorPrimary"> |
||||
|
||||
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto" |
||||
android:id="@+id/container" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_gravity="center_horizontal" |
||||
android:gravity="center" |
||||
android:orientation="vertical" |
||||
android:padding="32dp"> |
||||
|
||||
<ImageView |
||||
android:layout_width="128dp" |
||||
android:layout_height="128dp" |
||||
android:layout_marginBottom="32dp" |
||||
android:contentDescription="@string/alt_app_logo" |
||||
android:src="@drawable/funkwhale" |
||||
app:tint="@android:color/white" /> |
||||
|
||||
<TextView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="32dp" |
||||
android:text="@string/login_welcome" |
||||
android:textAlignment="center" |
||||
android:textColor="@android:color/white" /> |
||||
|
||||
<com.google.android.material.textfield.TextInputLayout |
||||
android:id="@+id/hostname_field" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="8dp" |
||||
android:textColorHint="@drawable/login_input" |
||||
app:boxBackgroundColor="@color/controlAccent" |
||||
app:boxBackgroundMode="filled" |
||||
app:boxStrokeWidth="0dp" |
||||
app:hintTextColor="@drawable/login_input"> |
||||
|
||||
<com.google.android.material.textfield.TextInputEditText |
||||
android:id="@+id/hostname" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:hint="@string/login_hostname" |
||||
android:inputType="textUri" |
||||
android:lines="1" |
||||
android:text="@string/debug.hostname" |
||||
android:textColor="@android:color/white" |
||||
android:textCursorDrawable="@null" /> |
||||
|
||||
</com.google.android.material.textfield.TextInputLayout> |
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox |
||||
android:id="@+id/cleartext" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:buttonTint="@android:color/white" |
||||
android:text="@string/login_cleartext" |
||||
android:textColor="@android:color/white" /> |
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox |
||||
android:id="@+id/anonymous" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:buttonTint="@android:color/white" |
||||
android:text="@string/login_anonymous" |
||||
android:textColor="@android:color/white" /> |
||||
|
||||
<com.google.android.material.textfield.TextInputLayout |
||||
android:id="@+id/username_field" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="8dp" |
||||
android:hint="@string/login_username" |
||||
android:textColorHint="@drawable/login_input" |
||||
app:boxBackgroundColor="@color/controlAccent" |
||||
app:boxBackgroundMode="filled" |
||||
app:boxStrokeColor="@drawable/login_input" |
||||
app:boxStrokeWidth="0dp" |
||||
app:hintTextColor="@drawable/login_input"> |
||||
|
||||
<com.google.android.material.textfield.TextInputEditText |
||||
android:id="@+id/username" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:inputType="textEmailAddress" |
||||
android:lines="1" |
||||
android:text="@string/debug.username" |
||||
android:textColor="@android:color/white" |
||||
android:textCursorDrawable="@null" /> |
||||
|
||||
</com.google.android.material.textfield.TextInputLayout> |
||||
|
||||
<com.google.android.material.textfield.TextInputLayout |
||||
android:id="@+id/password_field" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="8dp" |
||||
android:hint="@string/login_password" |
||||
android:textColorHint="@drawable/login_input" |
||||
app:boxBackgroundColor="@color/controlAccent" |
||||
app:boxBackgroundMode="filled" |
||||
app:boxStrokeColor="@drawable/login_input" |
||||
app:boxStrokeWidth="0dp" |
||||
app:hintTextColor="@drawable/login_input" |
||||
app:passwordToggleEnabled="true"> |
||||
|
||||
<com.google.android.material.textfield.TextInputEditText |
||||
android:id="@+id/password" |
||||
android:layout_height="match_parent" |
||||
android:background="@color/surface"> |
||||
|
||||
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto" |
||||
android:id="@+id/container" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:inputType="textPassword" |
||||
android:lines="1" |
||||
android:text="@string/debug.password" |
||||
android:textColor="@android:color/white" |
||||
android:textCursorDrawable="@null" /> |
||||
|
||||
</com.google.android.material.textfield.TextInputLayout> |
||||
|
||||
<com.google.android.material.button.MaterialButton |
||||
android:id="@+id/login" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:backgroundTint="@color/colorAccent" |
||||
android:text="@string/login_submit" |
||||
android:textColor="@color/whiteWhileLight" /> |
||||
</LinearLayout> |
||||
android:layout_gravity="center_horizontal" |
||||
android:gravity="center" |
||||
android:orientation="vertical" |
||||
android:padding="32dp"> |
||||
|
||||
<ImageView |
||||
android:layout_width="128dp" |
||||
android:layout_height="128dp" |
||||
android:layout_marginBottom="32dp" |
||||
android:contentDescription="@string/alt_app_logo" |
||||
android:src="@drawable/funkwhale"/> |
||||
|
||||
<TextView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="32dp" |
||||
android:text="@string/login_welcome" |
||||
android:textAlignment="center" |
||||
android:textColor="@color/colorPrimary" /> |
||||
|
||||
<com.google.android.material.textfield.TextInputLayout |
||||
android:id="@+id/hostname_field" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="8dp" |
||||
android:textColorHint="@drawable/login_input" |
||||
app:boxBackgroundColor="@color/elevatedSurface" |
||||
app:boxBackgroundMode="filled" |
||||
app:boxStrokeWidth="0dp" |
||||
app:hintTextColor="@drawable/login_input"> |
||||
|
||||
<com.google.android.material.textfield.TextInputEditText |
||||
android:id="@+id/hostname" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:hint="@string/login_hostname" |
||||
android:inputType="textUri" |
||||
android:lines="1" |
||||
android:text="@string/debug.hostname" |
||||
android:textColor="@color/controlColorText" |
||||
android:textCursorDrawable="@null" /> |
||||
|
||||
</com.google.android.material.textfield.TextInputLayout> |
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox |
||||
android:id="@+id/cleartext" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:buttonTint="@color/controlColorText" |
||||
android:text="@string/login_cleartext" |
||||
android:textColor="@color/controlColorText" /> |
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox |
||||
android:id="@+id/anonymous" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:buttonTint="@color/controlColorText" |
||||
android:text="@string/login_anonymous" |
||||
android:textColor="@color/controlColorText" /> |
||||
|
||||
<com.google.android.material.textfield.TextInputLayout |
||||
android:id="@+id/username_field" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="8dp" |
||||
android:hint="@string/login_username" |
||||
android:textColorHint="@drawable/login_input" |
||||
app:boxBackgroundColor="@color/elevatedSurface" |
||||
app:boxBackgroundMode="filled" |
||||
app:boxStrokeColor="@drawable/login_input" |
||||
app:boxStrokeWidth="0dp" |
||||
app:hintTextColor="@drawable/login_input"> |
||||
|
||||
<com.google.android.material.textfield.TextInputEditText |
||||
android:id="@+id/username" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:inputType="textEmailAddress" |
||||
android:lines="1" |
||||
android:text="@string/debug.username" |
||||
android:textColor="@color/controlColorText" |
||||
android:textCursorDrawable="@null" /> |
||||
|
||||
</com.google.android.material.textfield.TextInputLayout> |
||||
|
||||
<com.google.android.material.textfield.TextInputLayout |
||||
android:id="@+id/password_field" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginBottom="8dp" |
||||
android:hint="@string/login_password" |
||||
android:textColorHint="@drawable/login_input" |
||||
app:boxBackgroundColor="@color/elevatedSurface" |
||||
app:boxBackgroundMode="filled" |
||||
app:boxStrokeColor="@drawable/login_input" |
||||
app:boxStrokeWidth="0dp" |
||||
app:hintTextColor="@drawable/login_input" |
||||
app:passwordToggleEnabled="true"> |
||||
|
||||
<com.google.android.material.textfield.TextInputEditText |
||||
android:id="@+id/password" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:inputType="textPassword" |
||||
android:lines="1" |
||||
android:text="@string/debug.password" |
||||
android:textColor="@color/controlColorText" |
||||
android:textCursorDrawable="@null" /> |
||||
|
||||
</com.google.android.material.textfield.TextInputLayout> |
||||
|
||||
<com.google.android.material.button.MaterialButton |
||||
android:id="@+id/login" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:backgroundTint="@color/colorAccent" |
||||
android:text="@string/login_submit" |
||||
android:textColor="@color/whiteWhileLight" /> |
||||
</LinearLayout> |
||||
|
||||
</ScrollView> |
||||
|
@ -1,78 +1,78 @@
@@ -1,78 +1,78 @@
|
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:tools="http://schemas.android.com/tools" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginHorizontal="8dp" |
||||
android:layout_marginVertical="6dp" |
||||
android:background="@drawable/ripple" |
||||
android:gravity="center_vertical" |
||||
android:orientation="horizontal" |
||||
android:padding="8dp" |
||||
android:transitionGroup="true" |
||||
tools:showIn="@layout/fragment_tracks"> |
||||
|
||||
<org.funkwhale.ffa.views.SquareImageView |
||||
android:id="@+id/handle" |
||||
android:layout_width="18dp" |
||||
xmlns:tools="http://schemas.android.com/tools" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginEnd="16dp" |
||||
android:src="@drawable/reorder" |
||||
android:tint="#787878" |
||||
android:visibility="gone" |
||||
tools:visibility="visible" /> |
||||
android:layout_marginHorizontal="8dp" |
||||
android:layout_marginVertical="6dp" |
||||
android:background="@drawable/ripple" |
||||
android:gravity="center_vertical" |
||||
android:orientation="horizontal" |
||||
android:padding="8dp" |
||||
android:transitionGroup="true" |
||||
tools:showIn="@layout/fragment_tracks"> |
||||
|
||||
<org.funkwhale.ffa.views.SquareImageView |
||||
android:id="@+id/cover" |
||||
android:layout_width="48dp" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginEnd="16dp" |
||||
tools:src="@tools:sample/avatars" /> |
||||
<org.funkwhale.ffa.views.SquareImageView |
||||
android:id="@+id/handle" |
||||
android:layout_width="18dp" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginEnd="16dp" |
||||
android:src="@drawable/reorder" |
||||
android:tint="#787878" |
||||
android:visibility="gone" |
||||
tools:visibility="visible" /> |
||||
|
||||
<LinearLayout |
||||
android:layout_width="0dp" |
||||
android:layout_height="wrap_content" |
||||
android:layout_weight="1" |
||||
android:orientation="vertical"> |
||||
<org.funkwhale.ffa.views.SquareImageView |
||||
android:id="@+id/cover" |
||||
android:layout_width="48dp" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginEnd="16dp" |
||||
tools:src="@tools:sample/avatars" /> |
||||
|
||||
<LinearLayout |
||||
android:layout_width="0dp" |
||||
android:layout_height="wrap_content" |
||||
android:layout_weight="1" |
||||
android:orientation="vertical"> |
||||
|
||||
<TextView |
||||
android:id="@+id/title" |
||||
style="@style/AppTheme.ItemTitle" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:drawableStart="@drawable/downloaded" |
||||
android:drawablePadding="8dp" |
||||
android:drawableTint="@color/controlColor" |
||||
android:ellipsize="end" |
||||
android:lines="1" |
||||
tools:text="Absolution" /> |
||||
<TextView |
||||
android:id="@+id/title" |
||||
style="@style/AppTheme.ItemTitle" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:drawableStart="@drawable/downloaded" |
||||
android:drawablePadding="8dp" |
||||
android:drawableTint="@color/controlColor" |
||||
android:ellipsize="end" |
||||
android:lines="1" |
||||
tools:text="Absolution" /> |
||||
|
||||
<TextView |
||||
android:id="@+id/artist" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:ellipsize="end" |
||||
android:lines="1" |
||||
tools:text="Muse" /> |
||||
<TextView |
||||
android:id="@+id/artist" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:ellipsize="end" |
||||
android:lines="1" |
||||
tools:text="Muse" /> |
||||
|
||||
</LinearLayout> |
||||
</LinearLayout> |
||||
|
||||
<ImageButton |
||||
android:id="@+id/favorite" |
||||
style="@style/IconButton" |
||||
android:layout_width="24dp" |
||||
android:layout_height="24dp" |
||||
android:layout_marginStart="4dp" |
||||
android:layout_marginEnd="8dp" |
||||
android:contentDescription="@string/manage_add_to_favorites" |
||||
android:src="@drawable/favorite" /> |
||||
<ImageButton |
||||
android:id="@+id/favorite" |
||||
style="@style/IconButton" |
||||
android:layout_width="24dp" |
||||
android:layout_height="24dp" |
||||
android:layout_marginStart="4dp" |
||||
android:layout_marginEnd="8dp" |
||||
android:contentDescription="@string/manage_add_to_favorites" |
||||
android:src="@drawable/favorite" /> |
||||
|
||||
<ImageButton |
||||
android:id="@+id/actions" |
||||
style="@style/IconButton" |
||||
android:layout_width="24dp" |
||||
android:layout_height="24dp" |
||||
android:contentDescription="@string/alt_more_options" |
||||
android:src="@drawable/more" /> |
||||
<ImageButton |
||||
android:id="@+id/actions" |
||||
style="@style/IconButton" |
||||
android:layout_width="24dp" |
||||
android:layout_height="24dp" |
||||
android:contentDescription="@string/alt_more_options" |
||||
android:src="@drawable/more" /> |
||||
|
||||
</LinearLayout> |
||||
|
Loading…
Reference in new issue