Day theme partially applied.

This commit is contained in:
Anton Chekulaev
2020-08-20 16:47:15 +10:00
parent 2f09440355
commit 37a3ae9c32
20 changed files with 161 additions and 84 deletions

View File

@@ -27,13 +27,13 @@
android:gravity="center"
android:orientation="horizontal"
android:visibility="invisible"
tools:visibility="visible">
tools:visibility="invisible">
<ImageView
android:id="@+id/btnCancelGroupNameEdit"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_close_white_24dp"/>
android:src="@drawable/ic_baseline_clear_24"/>
<EditText
style="@style/SessionEditText"
@@ -56,7 +56,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:src="@drawable/ic_check_white_24dp"/>
android:src="@drawable/ic_baseline_done_24"/>
</LinearLayout>
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:visibility="visible"
tools:visibility="invisible">
tools:visibility="visible">
<TextView
android:id="@+id/lblGroupNameDisplay"
@@ -79,7 +79,7 @@
android:textAlignment="center"
android:paddingStart="24dp"
android:paddingEnd="0dp"
android:drawableEnd="@drawable/ic_edit_white_24dp"
android:drawableEnd="@drawable/ic_baseline_edit_24"
android:drawablePadding="@dimen/small_spacing"
tools:text="SomeGroupName"/>

View File

@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
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:id="@+id/contentView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/default_session_background"
xmlns:app="http://schemas.android.com/apk/res-auto">
tools:context="org.thoughtcrime.securesms.loki.activities.HomeActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@@ -14,8 +16,7 @@
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
app:contentInsetLeft="20dp"
app:contentInsetRight="20dp"
android:theme="?attr/actionBarStyle">
app:contentInsetRight="20dp">
<RelativeLayout
android:layout_width="match_parent"
@@ -25,33 +26,33 @@
android:id="@+id/profileButton"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size"
android:layout_marginLeft="9dp"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" />
android:layout_centerVertical="true"
android:layout_marginLeft="9dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Session"
android:textColor="@color/text"
android:textSize="@dimen/very_large_font_size"
android:fontFamily="sans-serif-medium"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="64dp" />
android:layout_marginLeft="64dp"
android:fontFamily="sans-serif-medium"
android:text="Session"
android:textColor="@color/text"
android:textSize="@dimen/very_large_font_size" />
<RelativeLayout
android:id="@+id/pathStatusViewContainer"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" >
android:layout_centerVertical="true">
<org.thoughtcrime.securesms.loki.views.PathStatusView
android:layout_width="@dimen/path_status_view_size"
android:layout_height="@dimen/path_status_view_size"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp" />
</RelativeLayout>

View File

@@ -2,9 +2,12 @@
<RelativeLayout
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"
android:layout_height="match_parent"
android:background="@drawable/default_session_background">
android:background="@drawable/default_session_background"
tools:theme="@style/Session.DarkTheme.NoActionBar"
tools:context="org.thoughtcrime.securesms.loki.activities.SettingsActivity">
<ScrollView
android:layout_width="match_parent"

View File

@@ -9,14 +9,11 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Session.DarkActionBar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
app:contentInsetLeft="24dp"
app:contentInsetRight="20dp"
android:background="@color/action_bar_background"
android:theme="@style/Session.DarkActionBar"
app:popupTheme="@style/Session.DarkActionBar">
app:contentInsetRight="20dp">
<LinearLayout
android:layout_width="match_parent"