Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0aeab80 authored by Fs00's avatar Fs00
Browse files

Use themed action bar in About activity

parent 2108dc04

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
            android:name=".AboutActivity"

            android:label="About"

            android:parentActivityName=".MainActivity_"

            android:theme="@style/Theme.Cyanea.Light.NoActionBar">

            android:theme="@style/Theme.Cyanea.Light.DarkActionBar">



            <!-- The meta-data tag is required if you support API level 15 and lower -->

            <meta-data

app/src/main/java/com/gsnathan/pdfviewer/AboutActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ public class AboutActivity extends CyaneaAppCompatActivity { 
    TextView versionView;   //shows the version

    private final String APP_VERSION_RELEASE = "Version " + Utils.getAppVersion();   //contains Version + the version number

    private final String APP_VERSION_DEBUG = "Version " + Utils.getAppVersion() + "-debug";   //contains Version + the version number + debug

    private Toolbar toolbar;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -55,17 +54,13 @@ public class AboutActivity extends CyaneaAppCompatActivity { 
    }



    private void setUpToolBar() {

        setSupportActionBar(toolbar);

        final long token = Binder.clearCallingIdentity();

        Binder.clearCallingIdentity();

        getSupportActionBar().setDisplayHomeAsUpEnabled(true);



    }



    private void initUI() {

        //initialize the textview

        versionView = (TextView) findViewById(R.id.versionTextView);

        //initialize the toolbar

        toolbar = (Toolbar) findViewById(R.id.toolbar_about);



        // check if app is debug

        if (BuildConfig.DEBUG) {

app/src/main/res/layout/activity_about.xml

+0 −16
Original line number Diff line number Diff line
@@ -30,22 +30,6 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



    <com.google.android.material.appbar.AppBarLayout

        android:id="@+id/my_app_bar_about"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="4dp"

        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">



            <androidx.appcompat.widget.Toolbar

                android:id="@+id/toolbar_about"

                android:layout_width="match_parent"

                android:layout_height="?attr/actionBarSize"

                android:theme="@style/ThemeOverlay.AppCompat.ActionBar"

                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />



    </com.google.android.material.appbar.AppBarLayout>



    <ScrollView

        android:id="@+id/scrollView"

        android:layout_width="match_parent"