From 6f987f29207c2b6b974f2fbc02ebb727916f0bec Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 22 Dec 2022 14:51:33 +0100 Subject: [PATCH] improve broken status bar layouting --- .../keychain/ui/MainActivity.java | 12 +++--- .../keychain/ui/ViewKeyAdvActivity.java | 1 - .../keychain/ui/base/BaseActivity.java | 2 - .../keychain/ui/keyview/ViewKeyActivity.java | 7 ++++ .../main/res/layout/create_key_activity.xml | 41 +++++++++---------- .../src/main/res/layout/custom_actionbar.xml | 14 ------- .../res/layout/decrypt_files_activity.xml | 6 --- .../main/res/layout/decrypt_text_activity.xml | 2 - .../res/layout/encrypt_files_activity.xml | 2 - .../main/res/layout/encrypt_text_activity.xml | 2 - .../main/res/layout/import_keys_activity.xml | 6 --- .../src/main/res/layout/main_activity.xml | 11 +++-- .../main/res/layout/toolbar_inner_layout.xml | 13 +----- .../res/layout/toolbar_inner_layout_white.xml | 13 +----- .../main/res/layout/toolbar_standalone.xml | 7 ++-- .../res/layout/toolbar_standalone_orange.xml | 3 +- .../res/layout/toolbar_standalone_white.xml | 3 +- .../src/main/res/layout/toolbar_tabs.xml | 3 +- .../src/main/res/layout/view_key_activity.xml | 2 - .../src/main/res/values-v21/dimens.xml | 1 - .../src/main/res/values-v21/themes.xml | 3 -- OpenKeychain/src/main/res/values/dimens.xml | 1 - 22 files changed, 50 insertions(+), 105 deletions(-) delete mode 100644 OpenKeychain/src/main/res/layout/custom_actionbar.xml diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index ce26e88e0..93a1ef5ed 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java @@ -55,16 +55,11 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai public static final String EXTRA_INIT_FRAG = "init_frag"; public Drawer mDrawer; - private Toolbar mToolbar; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main_activity); - - mToolbar = findViewById(R.id.toolbar); - mToolbar.setTitle(R.string.app_name); - setSupportActionBar(mToolbar); + setTitle(R.string.app_name); mDrawer = new DrawerBuilder() .withActivity(this) @@ -159,6 +154,11 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai } + @Override + protected void initLayout() { + setContentView(R.layout.main_activity); + } + @Override public void onNewIntent(Intent data) { super.onNewIntent(data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java index 821ca8e3f..27e259855 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java @@ -185,7 +185,6 @@ public class ViewKeyAdvActivity extends BaseActivity implements OnPageChangeList } } mToolbar.setBackgroundColor(color); - mStatusBar.setBackgroundColor(ViewKeyActivity.getStatusBarBackgroundColor(color)); slidingTabLayout.setBackgroundColor(color); invalidateOptionsMenu(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java index e18209e08..301be4157 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java @@ -39,7 +39,6 @@ import org.sufficientlysecure.keychain.ui.util.ThemeChanger; */ public abstract class BaseActivity extends AppCompatActivity { protected Toolbar mToolbar; - protected View mStatusBar; protected ThemeChanger mThemeChanger; @Override @@ -83,7 +82,6 @@ public abstract class BaseActivity extends AppCompatActivity { setSupportActionBar(mToolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } - mStatusBar = findViewById(R.id.status_bar); } /** diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java index 2a6e507d4..4951f6441 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java @@ -34,6 +34,8 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -41,6 +43,7 @@ import android.os.Messenger; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.WindowManager.LayoutParams; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; @@ -154,6 +157,10 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity { @SuppressLint("InflateParams") @Override protected void onCreate(Bundle savedInstanceState) { + if (VERSION.SDK_INT >= VERSION_CODES.KITKAT) { + getWindow().addFlags(LayoutParams.FLAG_TRANSLUCENT_STATUS); + } + super.onCreate(savedInstanceState); keyRepository = KeyRepository.create(this); diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index ecf69e640..0b0b38a7a 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -1,27 +1,26 @@ - + android:layout_height="match_parent" + android:orientation="vertical" + android:fitsSystemWindows="true"> - - - - + android:layout_height="wrap_content" + android:background="?attr/colorPrimary" + android:elevation="4dp" + android:minHeight="?attr/actionBarSize" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" /> - + - - \ No newline at end of file + diff --git a/OpenKeychain/src/main/res/layout/custom_actionbar.xml b/OpenKeychain/src/main/res/layout/custom_actionbar.xml deleted file mode 100644 index 63c32335e..000000000 --- a/OpenKeychain/src/main/res/layout/custom_actionbar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml index 3d214dbf6..e57c01b13 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml @@ -7,14 +7,8 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone_white" /> - diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml index 41d7c5c95..c68d82421 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -13,8 +13,6 @@ --> diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml index 435ea96df..b138d6797 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml @@ -14,8 +14,6 @@ diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml index 64ce50b74..5277efade 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml @@ -14,8 +14,6 @@ diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index c49ad5a10..6fbd9f2b6 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -7,16 +7,10 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> - diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml index c620d999f..50720d3b0 100644 --- a/OpenKeychain/src/main/res/layout/main_activity.xml +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -2,16 +2,16 @@ + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml b/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml index 1d5520a2f..b3557b33f 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml @@ -3,23 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - diff --git a/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml b/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml index 6cfa9812d..09c3d7b28 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml @@ -3,23 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml index 4ab94060c..cbf921b3a 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml @@ -1,13 +1,14 @@ - + android:layout_height="wrap_content" + > - + diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml index b8c190a36..800226833 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml @@ -4,7 +4,8 @@ android:elevation="4dp" android:background="@color/android_orange_light" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + > + android:layout_height="wrap_content" + > + android:layout_height="wrap_content" + > 141dp 243dp - -25dp \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml index 0c60a5a32..392e578b4 100644 --- a/OpenKeychain/src/main/res/values-v21/themes.xml +++ b/OpenKeychain/src/main/res/values-v21/themes.xml @@ -2,8 +2,6 @@