TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 12:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistent action bar styles.

Browse Source
This commit is contained in:
Anton Chekulaev 2020-08-25 23:52:42 +10:00
parent 724d323125
commit 9f689c56dc
14 changed files with 90 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-sw400dp/activity_register.xml
View File

@ -71,9 +71,9 @@
android:layout_marginLeft="@dimen/massive_spacing" android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginRight="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing"
android:gravity="center" android:gravity="center"
android:textColorLink="@color/text" android:textColor="?android:textColorTertiary"
android:textColorLink="?colorAccent"
android:textSize="@dimen/very_small_font_size" android:textSize="@dimen/very_small_font_size"
android:textColor="@color/text"
android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated --> android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
</LinearLayout> </LinearLayout>

4
res/layout-sw400dp/activity_restore.xml
View File

@ -63,9 +63,9 @@
android:layout_marginLeft="@dimen/massive_spacing" android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginRight="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing"
android:gravity="center" android:gravity="center"
android:textColorLink="@color/text" android:textColor="?android:textColorTertiary"
android:textColorLink="?colorAccent"
android:textSize="@dimen/very_small_font_size" android:textSize="@dimen/very_small_font_size"
android:textColor="@color/text"
android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated --> android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
</LinearLayout> </LinearLayout>

22
res/layout/activity_home.xml
View File

@ -12,14 +12,20 @@
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" android:background="?colorPrimary"
app:contentInsetLeft="20dp" android:elevation="1dp">
app:contentInsetRight="20dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="?attr/actionBarSize"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp">
<org.thoughtcrime.securesms.loki.views.ProfilePictureView <org.thoughtcrime.securesms.loki.views.ProfilePictureView
android:id="@+id/profileButton" android:id="@+id/profileButton"
@ -58,13 +64,15 @@
</RelativeLayout> </RelativeLayout>
</androidx.appcompat.widget.Toolbar>
<org.thoughtcrime.securesms.loki.views.SeedReminderView <org.thoughtcrime.securesms.loki.views.SeedReminderView
android:id="@+id/seedReminderView" android:id="@+id/seedReminderView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">

4
res/layout/activity_register.xml
View File

@ -72,9 +72,9 @@
android:layout_marginLeft="@dimen/massive_spacing" android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginRight="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing"
android:gravity="center" android:gravity="center"
android:textColorLink="@color/text" android:textColor="?android:textColorTertiary"
android:textColorLink="?colorAccent"
android:textSize="@dimen/very_small_font_size" android:textSize="@dimen/very_small_font_size"
android:textColor="@color/text"
android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated --> android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
</LinearLayout> </LinearLayout>

1
res/layout/conversation_activity.xml
View File

@ -9,7 +9,6 @@
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
style="@style/Session.DarkActionBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
app:contentInsetLeft="24dp" app:contentInsetLeft="24dp"

2
res/layout/media_overview_activity.xml
View File

@ -14,7 +14,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize" android:layout_height="?android:attr/actionBarSize"
style="@style/Session.DarkActionBar" style="@style/Widget.Session.ActionBar"
app:layout_scrollFlags="scroll|enterAlways"/> app:layout_scrollFlags="scroll|enterAlways"/>
<org.thoughtcrime.securesms.components.ControllableTabLayout <org.thoughtcrime.securesms.components.ControllableTabLayout

2
res/layout/share_activity.xml
View File

@ -15,7 +15,7 @@
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
android:background="?colorPrimary" android:background="?colorPrimary"
android:elevation="0dp" android:elevation="0dp"
android:theme="@style/Session.DarkActionBar"> android:theme="@style/Widget.Session.ActionBar">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

16
res/values-notnight-v28/styles.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog"> <!-- <style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">-->
<item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item> <!-- <item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item>-->
</style> <!-- </style>-->
<style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar"> <!-- <style name="Widget.Session.ActionBar" parent="@style/Widget.AppCompat.ActionBar">-->
<item name="background">@color/action_bar_background</item> <!-- <item name="background">@color/action_bar_background</item>-->
<item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item> <!-- <item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>-->
<item name="actionMenuTextColor">@color/text</item> <!-- <item name="actionMenuTextColor">@color/text</item>-->
</style> <!-- </style>-->
</resources> </resources>

37
res/values/styles.xml
View File

@ -2,39 +2,24 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Session --> <!-- Session -->
<style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar"> <style name="Widget.Session.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
<item name="background">@color/action_bar_background</item> <item name="android:elevation">1dp</item>
<item name="android:textColor">@color/text</item> <item name="elevation">1dp</item>
<item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item> <item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
<item name="elevation">0dp</item>
<item name="minHeight">?attr/actionBarSize</item> <item name="minHeight">?attr/actionBarSize</item>
<item name="popupTheme">@style/Session.DarkActionBar</item> <item name="popupTheme">@style/Widget.Session.ActionBar</item>
</style> </style>
<style name="Session.DarkSubtitleActionBar" parent="@style/Widget.AppCompat.ActionBar"> <style name="Widget.Session.ActionBar.Flat">
<item name="titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item> <item name="android:elevation">0dp</item>
<item name="subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
<item name="elevation">0dp</item> <item name="elevation">0dp</item>
</style> </style>
<style name="Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title"> <style name="TextAppearance.Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<!-- <item name="android:textColor">@color/text</item>--> <item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">@dimen/very_large_font_size</item> <item name="android:textSize">@dimen/very_large_font_size</item>
</style> </style>
<style name="Session.DarkSubtitleActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<!-- <item name="android:textColor">@color/text</item>-->
<item name="android:textSize">@dimen/large_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="Session.DarkSubtitleActionBar.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<!-- <item name="android:textColor">@color/text</item>-->
<item name="android:textSize">@dimen/small_font_size</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView"> <style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
<item name="closeIcon">@drawable/ic_close_white_24dp</item> <item name="closeIcon">@drawable/ic_close_white_24dp</item>
</style> </style>
@ -227,7 +212,7 @@
parent="@style/Widget.AppCompat.ActionBar"> parent="@style/Widget.AppCompat.ActionBar">
<item name="background">@color/core_grey_90</item> <item name="background">@color/core_grey_90</item>
<item name="android:popupTheme" tools:ignore="NewApi">@style/ThemeOverlay.AppCompat.Dark</item> <item name="android:popupTheme" tools:ignore="NewApi">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="elevation">4dp</item> <item name="elevation">1dp</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item> <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item> <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
@ -237,7 +222,7 @@
<style name="TextSecure.LightActionBar" <style name="TextSecure.LightActionBar"
parent="@style/Widget.AppCompat.ActionBar"> parent="@style/Widget.AppCompat.ActionBar">
<item name="background">@color/textsecure_primary</item> <item name="background">@color/textsecure_primary</item>
<item name="elevation">4dp</item> <item name="elevation">1dp</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item> <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item> <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>

16
res/values/themes.xml
View File

@ -18,15 +18,19 @@
<item name="android:windowBackground">@drawable/default_session_background</item> <item name="android:windowBackground">@drawable/default_session_background</item>
<item name="android:colorBackground">@color/default_background_start</item> <item name="android:colorBackground">@color/default_background_start</item>
<item name="android:navigationBarColor">@color/compose_view_background</item> <item name="android:navigationBarColor">@color/compose_view_background</item>
<!-- TODO Separate action bar theme/style --> <!-- <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>-->
<!-- <item name="actionBarStyle">@style/Session.DarkActionBar</item>--> <!-- <item name="actionBarTheme">@style/Widget.Session.ActionBar</item>-->
<item name="actionBarTheme">@style/Session.DarkActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
<item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
<item name="alertDialogTheme">@style/Session.AlertDialog</item> <item name="alertDialogTheme">@style/Session.AlertDialog</item>
<item name="bottomSheetDialogTheme">@style/SessionBottomSheetDialogTheme</item> <item name="bottomSheetDialogTheme">@style/SessionBottomSheetDialogTheme</item>
<item name="preferenceTheme">@style/Session.SettingsTheme</item> <item name="preferenceTheme">@style/Session.SettingsTheme</item>
<item name="statusBarBackground">@color/accent</item> <item name="statusBarBackground">@color/accent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="titleTextColor">?android:textColorPrimary</item>
<item name="appBarLayoutStyle">@style/Widget.Design.AppBarLayout</item> <item name="appBarLayoutStyle">@style/Widget.Design.AppBarLayout</item>
@ -373,7 +377,7 @@
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item> <!-- <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>-->
<item name="colorPrimary">@color/action_bar_background</item> <item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimaryDark">@color/action_bar_background</item> <item name="colorPrimaryDark">@color/action_bar_background</item>
@ -390,7 +394,7 @@
<item name="media_overview_document_secondary">#99FFFFFF</item> <item name="media_overview_document_secondary">#99FFFFFF</item>
<item name="theme_type">dark</item> <item name="theme_type">dark</item>
<item name="actionBarTheme">@style/Session.DarkActionBar</item> <!-- <item name="actionBarTheme">@style/Widget.Session.ActionBar</item>-->
<item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item> <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
<item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item> <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
<!-- <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>--> <!-- <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>-->

2
src/org/thoughtcrime/securesms/loki/views/DeviceView.kt
View File

@ -30,7 +30,7 @@ class DeviceView : LinearLayout {
} }
private fun setUpViewHierarchy() { private fun setUpViewHierarchy() {
val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val contentView = inflater.inflate(R.layout.view_device, null) val contentView = inflater.inflate(R.layout.view_device, null)
addView(contentView) addView(contentView)
} }

2
src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
View File

@ -37,7 +37,7 @@ class FakeChatView : ScrollView {
} }
private fun setUpViewHierarchy() { private fun setUpViewHierarchy() {
val inflater = context.applicationContext.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater val inflater = context.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
val contentView = inflater.inflate(R.layout.view_fake_chat, null) val contentView = inflater.inflate(R.layout.view_fake_chat, null)
addView(contentView) addView(contentView)
isVerticalScrollBarEnabled = false isVerticalScrollBarEnabled = false

2
src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
View File

@ -44,7 +44,7 @@ class ProfilePictureView : RelativeLayout {
} }
private fun setUpViewHierarchy() { private fun setUpViewHierarchy() {
val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val contentView = inflater.inflate(R.layout.view_profile_picture, null) val contentView = inflater.inflate(R.layout.view_profile_picture, null)
addView(contentView) addView(contentView)
} }

2
src/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
View File

@ -35,7 +35,7 @@ class SeedReminderView : FrameLayout {
} }
private fun setUpViewHierarchy() { private fun setUpViewHierarchy() {
val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val contentView = inflater.inflate(R.layout.view_seed_reminder, null) val contentView = inflater.inflate(R.layout.view_seed_reminder, null)
addView(contentView) addView(contentView)
button.setOnClickListener { delegate?.handleSeedReminderViewContinueButtonTapped() } button.setOnClickListener { delegate?.handleSeedReminderViewContinueButtonTapped() }