X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=bc481a6de20a319008b42dba06f39509a73d1956;hb=42fcb92013bb28047b0fb2a81f86eea90416cb09;hp=0d800fce3e920e3b7193c43ed87da58f936bcf18;hpb=3b48622074fe2d9bd481601a745e819cd171aa60;p=mobile-ledger.git 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 0d800fce..bc481a6d 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 @@ -36,7 +36,6 @@ import android.view.animation.AnimationUtils; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import android.widget.Toast; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.widget.Toolbar; @@ -50,6 +49,7 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DbOpQueue; @@ -185,12 +185,14 @@ public class MainActivity extends ProfileThemedActivity { } barDrawerToggle.syncState(); - TextView ver = drawer.findViewById(R.id.drawer_version_text); try { PackageInfo pi = getApplicationContext().getPackageManager() .getPackageInfo(getPackageName(), 0); - ver.setText(pi.versionName); + ((TextView) findViewById(R.id.nav_upper).findViewById( + R.id.drawer_version_text)).setText(pi.versionName); + ((TextView) findViewById(R.id.no_profiles_layout).findViewById( + R.id.drawer_version_text)).setText(pi.versionName); } catch (Exception e) { e.printStackTrace(); @@ -429,7 +431,7 @@ public class MainActivity extends ProfileThemedActivity { fab.show(); } else { - mToolbar.setSubtitle(R.string.profile_subitlte_read_only); + mToolbar.setSubtitle(R.string.profile_subtitle_read_only); fab.hide(); } } @@ -595,8 +597,8 @@ public class MainActivity extends ProfileThemedActivity { TransactionListViewModel.scheduleTransactionListReload(); } else - Toast.makeText(this, error, Toast.LENGTH_LONG) - .show(); + Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG) + .show(); } public void onRetrieveStart() { ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar);