diff options
author | stefan-niedermann <info@niedermann.it> | 2019-10-15 17:54:46 +0300 |
---|---|---|
committer | stefan-niedermann <info@niedermann.it> | 2019-10-15 17:54:46 +0300 |
commit | bab8108c787340557c8a7f964120f5398b496f95 (patch) | |
tree | fb946d8fb0ca6acc0f0221b1eac5b5c0b2e6d10e /app/src/main/java/it/niedermann/nextcloud/deck | |
parent | 54cbfbc805c0b5dd4623252d31875b8667081e06 (diff) |
Use toolbar everywhere
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck')
4 files changed, 14 insertions, 3 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)); |