diff options
8 files changed, 34 insertions, 14 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java index 419bb34e6..bb82139c1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java @@ -3,6 +3,7 @@ package it.niedermann.nextcloud.deck.ui; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; @@ -21,6 +22,8 @@ import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler; public class AboutActivity extends AppCompatActivity { + @BindView(R.id.toolbar) + Toolbar toolbar; @BindView(R.id.pager) ViewPager mViewPager; @BindView(R.id.tabs) @@ -34,6 +37,7 @@ public class AboutActivity extends AppCompatActivity { setContentView(R.layout.activity_about); ButterKnife.bind(this); + setSupportActionBar(toolbar); mViewPager.setAdapter(new TabsPagerAdapter(getSupportFragmentManager())); mTabLayout.setupWithViewPager(mViewPager); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java index 76e8c5b08..e09f344bb 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java @@ -8,6 +8,7 @@ import android.view.MenuItem; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import androidx.viewpager.widget.ViewPager; import com.google.android.material.tabs.TabLayout; @@ -41,9 +42,10 @@ public class EditActivity extends AppCompatActivity { SyncManager syncManager; private ActionBar actionBar; + @BindView(R.id.toolbar) + Toolbar toolbar; @BindView(R.id.tab_layout) TabLayout tabLayout; - @BindView(R.id.pager) ViewPager pager; @@ -69,8 +71,9 @@ public class EditActivity extends AppCompatActivity { setContentView(R.layout.activity_edit); unbinder = ButterKnife.bind(this); + setSupportActionBar(toolbar); actionBar = Objects.requireNonNull(getSupportActionBar()); - actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp); actionBar.setElevation(0); Bundle extras = getIntent().getExtras(); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 1a0a9689c..082ff21a8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -79,7 +79,7 @@ public class MainActivity extends DrawerActivity { @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getAppTheme(this) ? R.style.DarkAppTheme_NoActionBar : R.style.AppTheme_NoActionBar); + setTheme(Application.getAppTheme(this) ? R.style.DarkAppTheme : R.style.AppTheme); setContentView(R.layout.activity_main); ButterKnife.bind(this); super.onCreate(savedInstanceState); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java index dd44d6ddf..5b558e304 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java @@ -8,6 +8,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import java.io.PrintWriter; import java.io.StringWriter; @@ -23,6 +24,8 @@ public class ExceptionActivity extends AppCompatActivity { Throwable throwable; + @BindView(R.id.toolbar) + Toolbar toolbar; @BindView(R.id.message) TextView message; @BindView(R.id.stacktrace) @@ -37,6 +40,7 @@ public class ExceptionActivity extends AppCompatActivity { super.onCreate(savedInstanceState); throwable = ((Throwable) getIntent().getSerializableExtra(KEY_THROWABLE)); throwable.printStackTrace(); + setSupportActionBar(toolbar); Objects.requireNonNull(getSupportActionBar()).setTitle(getString(R.string.error)); this.message.setText(throwable.getMessage()); this.stacktrace.setText("Version: " + BuildConfig.VERSION_NAME + "\n\n" + getStacktraceOf(throwable)); diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 78e17475d..8e85291c0 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -4,6 +4,11 @@ android:layout_height="match_parent" android:orientation="vertical"> + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?android:actionBarSize" /> + <com.google.android.material.tabs.TabLayout android:id="@+id/tabs" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index fb0c5b6de..6a3669721 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -5,6 +5,11 @@ android:layout_height="match_parent" android:orientation="vertical"> + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?android:actionBarSize" /> + <com.google.android.material.tabs.TabLayout android:id="@+id/tab_layout" style="@style/Widget.MaterialComponents.TabLayout.Colored" diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml index 120532edc..297eb7c4f 100644 --- a/app/src/main/res/layout/activity_exception.xml +++ b/app/src/main/res/layout/activity_exception.xml @@ -4,18 +4,22 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/standard_margin"> + android:orientation="vertical"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?android:actionBarSize" /> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:padding="@dimen/standard_margin"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/message" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/standard_margin" android:layout_weight="1" android:hint="An error appeared." app:drawableEndCompat="@drawable/ic_bug_report_black_24dp" @@ -28,9 +32,9 @@ android:id="@+id/stacktrace" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginBottom="@dimen/standard_margin" android:layout_weight="1" android:fontFamily="monospace" + android:padding="@dimen/standard_margin" android:scrollbars="horizontal|vertical" android:textIsSelectable="true" /> @@ -39,6 +43,7 @@ android:layout_height="wrap_content" android:gravity="end" android:orientation="horizontal" + android:padding="@dimen/standard_margin" android:weightSum="1.0"> <Button diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0ca63bbc4..09d842a82 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -7,9 +7,6 @@ <item name="colorAccent">@color/primary</item> <item name="android:windowContentOverlay">@null</item> <item name="android:elevation">@null</item> - </style> - - <style name="AppTheme.NoActionBar" parent="AppTheme"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> @@ -24,9 +21,6 @@ <item name="colorAccent">@color/primary</item> <item name="android:textColor">@color/fg_secondary</item> <item name="android:textViewStyle">@style/DarkTextView</item> - </style> - - <style name="DarkAppTheme.NoActionBar" parent="DarkAppTheme"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> |