diff --git a/CHANGELOG.md b/CHANGELOG.md index 8548899..cc11917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -**1.5.2.13** +**1.5.2.15/16** + +- Adding an account header on the lateral drawer. + +- The account header is only displayed when the setting is enabled. + +**1.5.2.13/14** - Updated glide. diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt index d5bff16..3f29c6d 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt @@ -66,7 +66,6 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem import com.ftinc.scoop.Scoop import com.mikepenz.materialdrawer.AccountHeader import com.mikepenz.materialdrawer.AccountHeaderBuilder -import com.mikepenz.materialdrawer.holder.DimenHolder import com.mikepenz.materialdrawer.model.ProfileDrawerItem @@ -97,6 +96,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private var maybeSourceFilter: Sources? = null private var maybeSearchFilter: String? = null private var userIdentifier: String = "" + private var displayAccountHeader: Boolean = false private lateinit var emptyText: TextView private lateinit var recyclerView: RecyclerView @@ -293,47 +293,55 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { fullHeightCards = sharedPref.getBoolean("full_height_cards", false) itemsNumber = sharedPref.getString("prefer_api_items_number", "200").toInt() userIdentifier = sharedPref.getString("unique_id", "") + displayAccountHeader = sharedPref.getBoolean("account_header_displaying", false) } private fun handleDrawer(dirtyPref: SharedPreferences) { + displayAccountHeader = + PreferenceManager.getDefaultSharedPreferences(this) + .getBoolean("account_header_displaying", false) + val headerResult: AccountHeader? = if (displayAccountHeader) { + AccountHeaderBuilder() + .withActivity(this) + .withHeaderBackground(R.drawable.bg) + .addProfiles( + ProfileDrawerItem() + .withName( + dirtyPref.getString("url", "") + ) + .withIcon(resources.getDrawable(R.mipmap.ic_launcher)) + ) + .withSelectionListEnabledForSingleProfile(false) + .build() + } else null - val headerResult: AccountHeader = AccountHeaderBuilder() - .withActivity(this) - .withHeaderBackground(R.drawable.bg) - .addProfiles( - ProfileDrawerItem() - .withName( - dirtyPref.getString("url", "") - ) - .withIcon(resources.getDrawable(R.mipmap.ic_launcher)) - ) - .withSelectionListEnabledForSingleProfile(false) - .build() + val drawerBuilder = + DrawerBuilder() + .withActivity(this) + .withRootView(R.id.drawer_layout) + .withToolbar(toolbar) + .withActionBarDrawerToggle(true) + .withActionBarDrawerToggleAnimated(true) + .withShowDrawerOnFirstLaunch(true) + .withOnDrawerListener(object: Drawer.OnDrawerListener { + override fun onDrawerSlide(v: View?, p1: Float) { + bottomBar.alpha = (1 - p1) + } - drawer = DrawerBuilder() - .withActivity(this) - .withAccountHeader(headerResult) - .withHeaderHeight(DimenHolder.fromDp(140)) - .withRootView(R.id.drawer_layout) - .withToolbar(toolbar) - .withActionBarDrawerToggle(true) - .withActionBarDrawerToggleAnimated(true) - .withShowDrawerOnFirstLaunch(true) - .withOnDrawerListener(object: Drawer.OnDrawerListener { - override fun onDrawerSlide(v: View?, p1: Float) { - bottomBar.alpha = (1 - p1) - } + override fun onDrawerClosed(v: View?) { + bottomBar.show() + } - override fun onDrawerClosed(v: View?) { - bottomBar.show() - } + override fun onDrawerOpened(v: View?) { + bottomBar.hide() + } - override fun onDrawerOpened(v: View?) { - bottomBar.hide() - } + }) - }) - .build() + if (displayAccountHeader && headerResult != null) + drawerBuilder.withAccountHeader(headerResult) + + drawer = drawerBuilder.build() drawer.addStickyFooterItem( PrimaryDrawerItem() diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6ab0ece..4b42365 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -145,4 +145,6 @@ Aucun log quand un article est marqué comme lu Identifiant de debug Texte copié + Afficher une entête avec l\'url de votre instance de Selfoss en haut du drawer lateral. + Entête de compte \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 56fba18..a6f0c64 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -145,4 +145,7 @@ No log when marking an item as read Debug identifier Identifier copied to your clipboard + Display a header with the selfoss instance url on the lateral drawer. + Account header \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc5b4c6..8c80ddf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,4 +147,7 @@ Api calls will be logged when marking an article as read Debug identifier Identifier copied to your clipboard + Display a header with the selfoss instance url on the lateral drawer. + Account header \ No newline at end of file diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 3a550b9..14c2ac3 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -39,6 +39,11 @@ android:title="@string/pref_general_category_displaying"> +