X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=fd6942b03b6d2a21e51d1c1d76f572128e83774f;hp=bd28ab299c52f47d62a9025bef5287bfc73f7f56;hb=9fc9b9048e7917933611d881b8aa1ceb2abd2205;hpb=52aac35d8e7fd33dea55aa29f5b19ca6c39aaaa8 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index bd28ab29..fd6942b0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -38,6 +38,17 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager.widget.ViewPager; + import com.google.android.material.floatingactionbutton.FloatingActionButton; import net.ktnx.mobileledger.R; @@ -67,17 +78,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.widget.Toolbar; -import androidx.core.view.GravityCompat; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.viewpager.widget.ViewPager; - import static net.ktnx.mobileledger.utils.Logger.debug; public class MainActivity extends ProfileThemedActivity { @@ -309,7 +309,7 @@ public class MainActivity extends ProfileThemedActivity { } } private void createShortcuts(List list) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return; + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return; List shortcuts = new ArrayList<>(); int i = 0; @@ -473,7 +473,7 @@ public class MainActivity extends ProfileThemedActivity { public void fabNewTransactionClicked(View view) { Intent intent = new Intent(this, NewTransactionActivity.class); startActivity(intent); - overridePendingTransition(R.anim.slide_in_right, R.anim.dummy); + overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } public void navSettingsClicked(View view) { Intent intent = new Intent(this, SettingsActivity.class);