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=15e4bef5cd4c81fb1b6ef35db762a436f52691e0;hp=ad5da965d49ed5f11f059eb6eddd309f8c7c9c28;hb=09e26d2279484b4dfe0de218b05f075362fff4b5;hpb=3c3ae0a0335f908a43efbfca7ac18e5bbee3ea7c 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 ad5da965..15e4bef5 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 @@ -23,15 +23,15 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.widget.Toolbar; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.core.view.GravityCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.View; import android.widget.LinearLayout; @@ -87,6 +87,7 @@ public class MainActivity extends CrashReportingActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -381,6 +382,11 @@ public class MainActivity extends CrashReportingActivity { Intent intent = new Intent(this, ProfileListActivity.class); startActivity(intent); } + public void fabShouldShow() { + MobileLedgerProfile profile = Data.profile.get(); + if ((profile != null) && profile.isPostingPermitted()) fab.show(); + } + public class SectionsPagerAdapter extends FragmentPagerAdapter { public SectionsPagerAdapter(FragmentManager fm) { @@ -406,8 +412,4 @@ public class MainActivity extends CrashReportingActivity { return 2; } } - public void fabShouldShow() { - MobileLedgerProfile profile = Data.profile.get(); - if ((profile != null) && profile.isPostingPermitted()) fab.show(); - } }