mirror of
https://github.com/wallabag/android-app.git
synced 2026-05-19 15:10:37 +00:00
mainactivity toolbar and status bar design improvements
This commit is contained in:
@@ -32,6 +32,7 @@ import androidx.core.view.GravityCompat;
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.google.android.material.appbar.AppBarLayout;
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
import com.mikepenz.aboutlibraries.Libs;
|
||||
import com.mikepenz.aboutlibraries.LibsBuilder;
|
||||
@@ -298,6 +299,9 @@ public class MainActivity extends AppCompatActivity
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
AppBarLayout appBarLayout = findViewById(R.id.app_bar);
|
||||
appBarLayout.setExpanded(true, true);
|
||||
|
||||
// TODO: check logic
|
||||
if (checkConfigurationOnResume) {
|
||||
checkConfigurationOnResume = false;
|
||||
|
||||
@@ -9,31 +9,38 @@
|
||||
tools:context="fr.gaulupeau.apps.Poche.ui.MainActivity">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:id="@+id/app_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="?attr/appBarOverlayTheme">
|
||||
|
||||
<FrameLayout
|
||||
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_scrollFlags="scroll|enterAlways|snap">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="?attr/popupOverlayTheme"/>
|
||||
app:layout_collapseMode="pin">
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progressBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="10dp"
|
||||
android:visibility="gone"
|
||||
android:layout_gravity="bottom"
|
||||
style="?android:attr/progressBarStyleHorizontal"/>
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="?attr/popupOverlayTheme"/>
|
||||
|
||||
</FrameLayout>
|
||||
<ProgressBar
|
||||
android:id="@+id/progressBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="10dp"
|
||||
android:visibility="gone"
|
||||
android:layout_gravity="bottom"
|
||||
style="?android:attr/progressBarStyleHorizontal"/>
|
||||
</FrameLayout>
|
||||
|
||||
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
||||
<FrameLayout
|
||||
@@ -42,4 +49,4 @@
|
||||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
@@ -45,13 +45,14 @@
|
||||
<item name="icon_autoplay">@drawable/ic_redo_24dp</item>
|
||||
<item name="icon_menu">@drawable/ic_menu_24dp</item>
|
||||
<item name="android:textColorPrimary">@color/darkContrastBlack</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="LightTheme.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
<style name="LightTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
|
||||
<style name="LightTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
|
||||
@@ -64,7 +65,7 @@
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="DarkTheme" parent="Theme.AppCompat">
|
||||
@@ -86,13 +87,14 @@
|
||||
<item name="icon_fast_rewind">@drawable/ic_fast_rewind_white_24dp</item>
|
||||
<item name="icon_autoplay">@drawable/ic_redo_white_24dp</item>
|
||||
<item name="icon_menu">@drawable/ic_menu_white_24dp</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="DarkTheme.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
<style name="DarkTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar"/>
|
||||
<style name="DarkTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark"/>
|
||||
@@ -108,7 +110,7 @@
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="SolarizedTheme" parent="Theme.AppCompat.Light" >
|
||||
@@ -148,7 +150,7 @@
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
<style name="SolarizedTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar"/>
|
||||
<style name="SolarizedTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
|
||||
|
||||
Reference in New Issue
Block a user