mirror of
https://github.com/beemdevelopment/Aegis.git
synced 2025-06-23 17:40:58 +00:00
Rework theming a bit to partially fix dark mode on dialogs
Dark mode is still not great, but at least it's a little less broken now
This commit is contained in:
parent
3c2f62de26
commit
7be5d08a60
15 changed files with 79 additions and 132 deletions
|
@ -88,7 +88,8 @@
|
|||
android:layout_alignParentStart="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginStart="14dp"
|
||||
android:src="@drawable/ic_keyboard_arrow_down_black_24dp" />
|
||||
android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
|
||||
android:tint="#7f7f7f"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/accordian_title"
|
||||
|
@ -99,7 +100,6 @@
|
|||
android:layout_toEndOf="@+id/down_btn"
|
||||
android:padding="16dp"
|
||||
android:text="Advanced"
|
||||
android:textColor="#333"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
|
@ -7,20 +8,6 @@
|
|||
android:fitsSystemWindows="true"
|
||||
tools:context="me.impy.aegis.ui.MainActivity">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/AppTheme.AppBarOverlay">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<fragment
|
||||
android:name="me.impy.aegis.ui.views.KeyProfileView"
|
||||
android:id="@+id/key_profiles"
|
||||
|
|
|
@ -7,19 +7,7 @@
|
|||
android:fitsSystemWindows="true"
|
||||
tools:context="me.impy.aegis.ui.SlotManagerActivity">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/AppTheme.AppBarOverlay">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<android.support.v4.widget.NestedScrollView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical" android:layout_width="match_parent"
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -8,12 +10,13 @@
|
|||
android:padding="16dp"
|
||||
android:id="@+id/copy_button"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/ic_content_copy_black_24dp"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -26,13 +29,14 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:padding="16dp"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:id="@+id/edit_button"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/ic_create_black_24dp"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -46,12 +50,13 @@
|
|||
android:padding="16dp"
|
||||
android:id="@+id/delete_button"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/ic_delete_black_24dp"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -60,5 +65,4 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="Slot name"
|
||||
android:id="@+id/text_slot_name"
|
||||
android:textColor="@color/primary_text"/>
|
||||
android:textColor="?android:attr/textColorPrimary"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_slot_used"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue