From a2b96df9f95b45f65d38bdfc0633232a760e59e3 Mon Sep 17 00:00:00 2001 From: tom79 Date: Fri, 21 Jul 2017 19:28:29 +0200 Subject: [PATCH] Improves navigation with tabs in top bar --- README.md | 18 ++ .../mastodon/activities/MainActivity.java | 167 +++++++++++------- .../mastodon/activities/TootActivity.java | 33 +++- .../gouv/etalab/mastodon/helper/Helper.java | 3 +- .../res/drawable-hdpi/ic_action_globe_tl.png | Bin 0 -> 926 bytes .../res/drawable-hdpi/ic_action_home_tl.png | Bin 0 -> 486 bytes .../res/drawable-hdpi/ic_action_users_tl.png | Bin 0 -> 829 bytes .../res/drawable-hdpi/ic_notifications_tl.png | Bin 0 -> 225 bytes .../res/drawable-ldpi/ic_action_globe_tl.png | Bin 0 -> 456 bytes .../res/drawable-ldpi/ic_action_home_tl.png | Bin 0 -> 288 bytes .../res/drawable-ldpi/ic_action_users_tl.png | Bin 0 -> 394 bytes .../res/drawable-ldpi/ic_notifications_tl.png | Bin 0 -> 257 bytes .../res/drawable-mdpi/ic_action_globe_tl.png | Bin 0 -> 600 bytes .../res/drawable-mdpi/ic_action_home_tl.png | Bin 0 -> 322 bytes .../res/drawable-mdpi/ic_action_users_tl.png | Bin 0 -> 542 bytes .../res/drawable-mdpi/ic_notifications_tl.png | Bin 0 -> 171 bytes .../res/drawable-xhdpi/ic_action_globe_tl.png | Bin 0 -> 1352 bytes .../res/drawable-xhdpi/ic_action_home_tl.png | Bin 0 -> 716 bytes .../res/drawable-xhdpi/ic_action_users_tl.png | Bin 0 -> 1129 bytes .../drawable-xhdpi/ic_notifications_tl.png | Bin 0 -> 243 bytes .../drawable-xxhdpi/ic_action_globe_tl.png | Bin 0 -> 2138 bytes .../res/drawable-xxhdpi/ic_action_home_tl.png | Bin 0 -> 1067 bytes .../drawable-xxhdpi/ic_action_users_tl.png | Bin 0 -> 1735 bytes .../drawable-xxhdpi/ic_notifications_tl.png | Bin 0 -> 349 bytes .../drawable-xxxhdpi/ic_action_globe_tl.png | Bin 0 -> 5245 bytes .../drawable-xxxhdpi/ic_action_home_tl.png | Bin 0 -> 2470 bytes .../drawable-xxxhdpi/ic_action_users_tl.png | Bin 0 -> 4179 bytes .../drawable-xxxhdpi/ic_notifications_tl.png | Bin 0 -> 416 bytes app/src/main/res/layout/activity_main.xml | 12 +- 29 files changed, 155 insertions(+), 78 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_action_globe_tl.png create mode 100644 app/src/main/res/drawable-hdpi/ic_action_home_tl.png create mode 100644 app/src/main/res/drawable-hdpi/ic_action_users_tl.png create mode 100644 app/src/main/res/drawable-hdpi/ic_notifications_tl.png create mode 100644 app/src/main/res/drawable-ldpi/ic_action_globe_tl.png create mode 100644 app/src/main/res/drawable-ldpi/ic_action_home_tl.png create mode 100644 app/src/main/res/drawable-ldpi/ic_action_users_tl.png create mode 100644 app/src/main/res/drawable-ldpi/ic_notifications_tl.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_globe_tl.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_home_tl.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_users_tl.png create mode 100644 app/src/main/res/drawable-mdpi/ic_notifications_tl.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_globe_tl.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_home_tl.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_users_tl.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_notifications_tl.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_globe_tl.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_home_tl.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_globe_tl.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_home_tl.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_notifications_tl.png diff --git a/README.md b/README.md index 1da4bba4d..6c075882c 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,22 @@ The number of libraries is minimized and it does not use tracking tools. The sou ### Features **Multi-accounts management** + * Add accounts from different instances * Switch from one account to another by a simple click + **Timelines** + * Federated / Local / Home * Switch from one timeline to another by using the menu or by swiping the screen. * Clicks on toots display the related conversations (context) * Clicks on mentioned accounts display details about these accounts * Clicks on hashtags display toots containing this hashtags + **Actions on toots** + * Mute an account related to a toot * Block an account related to a toot * Report inappropriate toots to administrators @@ -25,7 +30,9 @@ The number of libraries is minimized and it does not use tracking tools. The sou * Download media * Translation of toots by a simple click (via the Yandex API) + **Write a toot** + * Add media * Change the visibility of the toot * Mention accounts in toots with autocompletion (@ + 2 characters) @@ -34,27 +41,38 @@ The number of libraries is minimized and it does not use tracking tools. The sou * Toots which have not been sent are saved (drafts) - can be disabled in settings * Drafts can be edited/deleted/scheduled + **Scheduled toots** + * Can be edited/deleted/scheduled at another date as long as they have not been sent. + **Interaction with accounts** + * Follow/Unfollow/Block/Unblock/Mute/Unmute * Display details of accounts * Authorize/Reject follow requests (for locked accounts) + **Searches** * A top bar allows to make researches for accounts/tags/toots * A click on a tag displays toots containing this tag + **Network optimization** + * Load of media: Automatic/WIFI only/Ask * Customization of the number of toots/accounts per load + **Notifications** + * Notifications for new toots on the home page (could be disabled in settings) * Notifications for new events (could be disabled or filtered in settings) + **Built-in browser** + * Full screen videos * Disable JavaScript (default: enabled) * Disable third-party cookies (default: disabled) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java index 702461207..ff9cfeb9c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java @@ -29,6 +29,7 @@ import android.support.v4.app.FragmentManager; import android.support.v4.view.ViewPager; import android.support.v7.app.AlertDialog; import android.support.v7.widget.SearchView; +import android.util.Log; import android.view.View; import android.support.design.widget.NavigationView; import android.support.v4.view.GravityCompat; @@ -54,6 +55,7 @@ import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer; import java.io.File; import java.util.HashMap; import java.util.Locale; +import java.util.Stack; import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoByIDAsyncTask; import fr.gouv.etalab.mastodon.client.Entities.Account; @@ -76,6 +78,7 @@ import static fr.gouv.etalab.mastodon.helper.Helper.HOME_TIMELINE_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION; import static fr.gouv.etalab.mastodon.helper.Helper.NOTIFICATION_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.PREF_KEY_ID; +import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; import static fr.gouv.etalab.mastodon.helper.Helper.changeUser; import static fr.gouv.etalab.mastodon.helper.Helper.loadPPInActionBar; import static fr.gouv.etalab.mastodon.helper.Helper.menuAccounts; @@ -99,6 +102,10 @@ public class MainActivity extends AppCompatActivity private TabLayout tabLayout; private ViewPager viewPager; private RelativeLayout main_app_container; + private Stack stackBack = new Stack<>(); + + public MainActivity() { + } @Override protected void onCreate(Bundle savedInstanceState) { @@ -106,7 +113,7 @@ public class MainActivity extends AppCompatActivity SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_LIGHT){ setTheme(R.style.AppTheme_NoActionBar); }else { @@ -122,6 +129,17 @@ public class MainActivity extends AppCompatActivity finish(); return; } + if( theme == Helper.THEME_DARK){ + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_home_tl,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_users_tl,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe_tl,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications_tl,R.color.dark_text); + }else { + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_home_tl,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_users_tl,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe_tl,R.color.black); + changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications_tl,R.color.black); + } Helper.fillMapEmoji(getApplicationContext()); //Here, the user is authenticated Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); @@ -139,6 +157,14 @@ public class MainActivity extends AppCompatActivity @Override public void onTabSelected(TabLayout.Tab tab) { viewPager.setCurrentItem(tab.getPosition()); + if (stackBack.empty()) + stackBack.push(0); + if (stackBack.contains(tab.getPosition())) { + stackBack.remove(stackBack.indexOf(tab.getPosition())); + stackBack.push(tab.getPosition()); + } else { + stackBack.push(tab.getPosition()); + } final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); MenuItem item = null; String fragmentTag = null; @@ -169,6 +195,10 @@ public class MainActivity extends AppCompatActivity unCheckAllMenuItems(navigationView.getMenu()); item.setChecked(true); } + if( tab.getPosition() < 3 ) + toot.setVisibility(View.VISIBLE); + else + toot.setVisibility(View.GONE); DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); drawer.closeDrawer(GravityCompat.START); } @@ -180,6 +210,17 @@ public class MainActivity extends AppCompatActivity @Override public void onTabReselected(TabLayout.Tab tab) { + if( viewPager.getVisibility() == View.GONE){ + viewPager.setVisibility(View.VISIBLE); + tabLayout.setVisibility(View.VISIBLE); + main_app_container.setVisibility(View.GONE); + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + } + if( tab.getPosition() <3 ) + toot.setVisibility(View.VISIBLE); + else + toot.setVisibility(View.GONE); } }); @@ -188,7 +229,6 @@ public class MainActivity extends AppCompatActivity toolbar_search.setOnQueryTextListener(new SearchView.OnQueryTextListener() { @Override public boolean onQueryTextSubmit(String query) { - toot.setVisibility(View.VISIBLE); //Hide keyboard InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(toolbar_search.getWindowToken(), 0); @@ -203,24 +243,8 @@ public class MainActivity extends AppCompatActivity } }); //Hide/Close the searchview - /*toolbar_search.setOnSearchClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if( toolbarTitle.getVisibility() == View.VISIBLE) - toolbarTitle.setVisibility(View.GONE); - if( pp_actionBar.getVisibility() == View.VISIBLE) - pp_actionBar.setVisibility(View.GONE); - } - });*/ - toolbar_search.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - if( hasFocus){ - toolbarTitle.setVisibility(View.GONE); - pp_actionBar.setVisibility(View.GONE); - } - } - }); + + toolbar_search.setOnCloseListener(new SearchView.OnCloseListener() { @Override public boolean onClose() { @@ -230,6 +254,18 @@ public class MainActivity extends AppCompatActivity return false; } }); + toolbar_search.setOnSearchClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if( toolbar_search.isIconified()){ + toolbarTitle.setVisibility(View.VISIBLE); + pp_actionBar.setVisibility(View.VISIBLE); + }else { + toolbarTitle.setVisibility(View.GONE); + pp_actionBar.setVisibility(View.GONE); + } + } + }); //Hide the default title if( getSupportActionBar() != null) @@ -296,44 +332,8 @@ public class MainActivity extends AppCompatActivity if (savedInstanceState == null && !matchingIntent) { navigationView.setCheckedItem(R.id.nav_home); navigationView.getMenu().performIdentifierAction(R.id.nav_home, 0); + toolbarTitle.setText(R.string.home_menu); } - //Title and menu selection when back pressed - getSupportFragmentManager().addOnBackStackChangedListener( - new FragmentManager.OnBackStackChangedListener() { - public void onBackStackChanged() { - FragmentManager fm = getSupportFragmentManager(); - if( fm != null && fm.getBackStackEntryCount() > 0) { - String fragmentTag = fm.getBackStackEntryAt(fm.getBackStackEntryCount() - 1).getName(); - if( fragmentTag != null) { - - if( tagTile.get(fragmentTag) != null) - toolbarTitle.setText(tagTile.get(fragmentTag)); - if( tagItem.get(fragmentTag) != null) { - unCheckAllMenuItems(navigationView.getMenu()); - if( navigationView.getMenu().findItem(tagItem.get(fragmentTag)) != null) - navigationView.getMenu().findItem(tagItem.get(fragmentTag)).setChecked(true); - } - if( fragmentTag.equals("HOME_TIMELINE") || fragmentTag.equals("LOCAL_TIMELINE") || fragmentTag.equals("PUBLIC_TIMELINE") || fragmentTag.equals("NOTIFICATIONS")){ - main_app_container.setVisibility(View.GONE); - viewPager.setVisibility(View.VISIBLE); - tabLayout.setVisibility(View.VISIBLE); - }else { - main_app_container.setVisibility(View.VISIBLE); - viewPager.setVisibility(View.GONE); - tabLayout.setVisibility(View.GONE); - } - - //selectTabBar(fragmentTag); - if( fragmentTag.equals("HOME_TIMELINE") || fragmentTag.equals("LOCAL_TIMELINE") || fragmentTag.equals("PUBLIC_TIMELINE") || fragmentTag.equals("SCHEDULED")){ - toot.setVisibility(View.VISIBLE); - }else { - toot.setVisibility(View.GONE); - } - } - } - } - }); - } private void unCheckAllMenuItems(@NonNull final Menu menu) { @@ -422,7 +422,40 @@ public class MainActivity extends AppCompatActivity if( !toolbar_search.isIconified()){ toolbar_search.setIconified(true); } - super.onBackPressed(); + if( viewPager.getVisibility() == View.VISIBLE){ + if (stackBack.size() > 1) { + stackBack.pop(); + viewPager.setCurrentItem(stackBack.lastElement()); + }else { + super.onBackPressed(); + } + }else { + viewPager.setVisibility(View.VISIBLE); + tabLayout.setVisibility(View.VISIBLE); + main_app_container.setVisibility(View.GONE); + final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + unCheckAllMenuItems(navigationView.getMenu()); + toot.setVisibility(View.VISIBLE); + switch (viewPager.getCurrentItem()){ + case 0: + toolbarTitle.setText(R.string.home_menu); + navigationView.getMenu().findItem(R.id.nav_home).setChecked(true); + break; + case 1: + toolbarTitle.setText(R.string.local_menu); + navigationView.getMenu().findItem(R.id.nav_home).setChecked(true); + break; + case 2: + toolbarTitle.setText(R.string.global_menu); + navigationView.getMenu().findItem(R.id.nav_home).setChecked(true); + break; + case 3: + toolbarTitle.setText(R.string.notifications); + navigationView.getMenu().findItem(R.id.nav_home).setChecked(true); + break; + } + } + } } @@ -549,7 +582,7 @@ public class MainActivity extends AppCompatActivity TabLayoutSettingsFragment tabLayoutSettingsFragment= new TabLayoutSettingsFragment(); fragmentTag = "TABLAYOUT_SETTINGS"; fragmentManager.beginTransaction() - .replace(R.id.main_app_container, tabLayoutSettingsFragment, fragmentTag).addToBackStack(fragmentTag).commit(); + .replace(R.id.main_app_container, tabLayoutSettingsFragment, fragmentTag).commit(); } else if (id == R.id.nav_favorites) { toot.setVisibility(View.GONE); @@ -558,7 +591,7 @@ public class MainActivity extends AppCompatActivity statusFragment.setArguments(bundle); fragmentTag = "FAVOURITES"; fragmentManager.beginTransaction() - .replace(R.id.main_app_container, statusFragment, fragmentTag).addToBackStack(fragmentTag).commit(); + .replace(R.id.main_app_container, statusFragment, fragmentTag).commit(); } else if (id == R.id.nav_blocked) { toot.setVisibility(View.GONE); accountsFragment = new DisplayAccountsFragment(); @@ -566,7 +599,7 @@ public class MainActivity extends AppCompatActivity accountsFragment.setArguments(bundle); fragmentTag = "BLOCKS"; fragmentManager.beginTransaction() - .replace(R.id.main_app_container, accountsFragment, fragmentTag).addToBackStack(fragmentTag).commit(); + .replace(R.id.main_app_container, accountsFragment, fragmentTag).commit(); }else if (id == R.id.nav_muted) { toot.setVisibility(View.GONE); accountsFragment = new DisplayAccountsFragment(); @@ -574,19 +607,19 @@ public class MainActivity extends AppCompatActivity accountsFragment.setArguments(bundle); fragmentTag = "MUTED"; fragmentManager.beginTransaction() - .replace(R.id.main_app_container, accountsFragment, fragmentTag).addToBackStack(fragmentTag).commit(); + .replace(R.id.main_app_container, accountsFragment, fragmentTag).commit(); }else if (id == R.id.nav_scheduled) { toot.setVisibility(View.VISIBLE); DisplayScheduledTootsFragment displayScheduledTootsFragment = new DisplayScheduledTootsFragment(); fragmentTag = "SCHEDULED"; fragmentManager.beginTransaction() - .replace(R.id.main_app_container, displayScheduledTootsFragment, fragmentTag).addToBackStack(fragmentTag).commit(); + .replace(R.id.main_app_container, displayScheduledTootsFragment, fragmentTag).commit(); }else if( id == R.id.nav_follow_request){ toot.setVisibility(View.GONE); DisplayFollowRequestSentFragment followRequestSentFragment = new DisplayFollowRequestSentFragment(); fragmentTag = "FOLLOW_REQUEST_SENT"; fragmentManager.beginTransaction() - .replace(R.id.main_app_container, followRequestSentFragment, fragmentTag).addToBackStack(fragmentTag).commit(); + .replace(R.id.main_app_container, followRequestSentFragment, fragmentTag).commit(); } //selectTabBar(fragmentTag); toolbarTitle.setText(item.getTitle()); @@ -653,27 +686,25 @@ public class MainActivity extends AppCompatActivity //Selection comes from another menu, no action to do DisplayStatusFragment statusFragment; Bundle bundle = new Bundle(); + toot.setVisibility(View.VISIBLE); switch (position) { case 0: - toot.setVisibility(View.VISIBLE); statusFragment = new DisplayStatusFragment(); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.HOME); statusFragment.setArguments(bundle); return statusFragment; case 1: - toot.setVisibility(View.VISIBLE); statusFragment = new DisplayStatusFragment(); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.LOCAL); statusFragment.setArguments(bundle); return statusFragment; case 2: - toot.setVisibility(View.VISIBLE); + statusFragment = new DisplayStatusFragment(); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.PUBLIC); statusFragment.setArguments(bundle); return statusFragment; case 3: - toot.setVisibility(View.GONE); return new DisplayNotificationsFragment(); } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index 29765422d..f2c674c6d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -24,13 +24,18 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.speech.RecognizerIntent; import android.support.design.widget.FloatingActionButton; import android.support.v4.content.LocalBroadcastManager; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.Html; import android.text.TextWatcher; @@ -57,7 +62,9 @@ import android.widget.Toast; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; +import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer; +import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; import java.io.FileNotFoundException; import java.io.InputStream; @@ -94,6 +101,7 @@ import fr.gouv.etalab.mastodon.sqlite.Sqlite; import mastodon.etalab.gouv.fr.mastodon.R; import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; +import static fr.gouv.etalab.mastodon.helper.Helper.loadPPInActionBar; /** * Created by Thomas on 01/05/2017. @@ -203,6 +211,27 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc }else { setTitle(R.string.toot_title); } + SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); + Account account = new AccountDAO(getApplicationContext(),db).getAccountByID(userId); + ImageLoader imageLoader; + DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false) + .cacheOnDisk(true).resetViewBeforeLoading(true).build(); + imageLoader = ImageLoader.getInstance(); + imageLoader.loadImage(account.getAvatar(), options, new SimpleImageLoadingListener(){ + @Override + public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { + super.onLoadingComplete(imageUri, view, loadedImage); + if( getSupportActionBar() != null){ + BitmapDrawable ppDrawable = new BitmapDrawable(getResources(), Bitmap.createScaledBitmap(loadedImage, (int) Helper.convertDpToPixel(25, getApplicationContext()), (int) Helper.convertDpToPixel(25, getApplicationContext()), true)); + getSupportActionBar().setIcon(ppDrawable); + getSupportActionBar().setDisplayShowHomeEnabled(true); + } + } + @Override + public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){ + + }}); if( sharedContent != null ){ //Shared content if( sharedSubject != null){ @@ -238,9 +267,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc LocalBroadcastManager.getInstance(this).registerReceiver(search_validate, new IntentFilter(Helper.SEARCH_VALIDATE_ACCOUNT)); FloatingActionButton toot_close_accounts = (FloatingActionButton) findViewById(R.id.toot_close_accounts); - SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); - String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); - Account account = new AccountDAO(getApplicationContext(),db).getAccountByID(userId); + boolean isAccountPrivate = account.isLocked(); FloatingActionButton ic_close = (FloatingActionButton) findViewById(R.id.toot_close_reply); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 8b93417d3..ac61e45bc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -109,6 +109,7 @@ import fr.gouv.etalab.mastodon.activities.HashTagActivity; import fr.gouv.etalab.mastodon.activities.LoginActivity; import fr.gouv.etalab.mastodon.activities.MainActivity; import fr.gouv.etalab.mastodon.activities.ShowAccountActivity; +import fr.gouv.etalab.mastodon.activities.TootActivity; import fr.gouv.etalab.mastodon.activities.WebviewActivity; import fr.gouv.etalab.mastodon.asynctasks.RemoveAccountAsyncTask; import fr.gouv.etalab.mastodon.client.Entities.Account; @@ -896,7 +897,7 @@ public class Helper { ppDrawable = new BitmapDrawable(activity.getResources(), Bitmap.createScaledBitmap(loadedImage, (int) convertDpToPixel(25, activity), (int) convertDpToPixel(25, activity), true)); toolBar.findViewById(R.id.pp_actionBar).setBackgroundDrawable(ppDrawable); }else{ - ActionBar supportActionBar = ((MainActivity) activity).getSupportActionBar(); + ActionBar supportActionBar = ((TootActivity) activity).getSupportActionBar(); if( supportActionBar != null){ ppDrawable = new BitmapDrawable(activity.getResources(), Bitmap.createScaledBitmap(loadedImage, (int) convertDpToPixel(20, activity), (int) convertDpToPixel(20, activity), true)); supportActionBar.setIcon(ppDrawable); diff --git a/app/src/main/res/drawable-hdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-hdpi/ic_action_globe_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..f76e15a6a858c1c87213866301642d53f8851fc4 GIT binary patch literal 926 zcmV;P17ZA$P)~92*}fjO<*zT0&l@FP^7!mf+sBZ0(4u97tzzf zRxkymL9;0$Pyuusxj6(jvr{p2JUDAH^1aQdi^xx44_FUQf+|bf`&lj%hyYGl@z+aq zj~Lx&9>3S~7jW|RD>6U8PH+I!DD6v|H`zxb2mul?UV>_Cr~JE;uJy=8z$-AjL?4sE zJLyZS0LFQ_X}0+`3A8X84LKMu@2}F;R?zpO4t=FrC#h3_EIiM_SmphE@X*8J^_t~7 z_-A*VxtnPn~l3&C1O9IpaeeG1sdwZQN)k-Z9#n_u8O z^P6jQt8*@))1=LZ@#^3dbh(h#pzq*_8K)Vg(k=odBrfnMpivo+oUTc1XV`KjLv3*p z(a+dlWZGTt(AQz5URGxqwbE;*5jOtY=V4wn+SFZYYY)_B!ft&RYMLsxLm0@ z(5}?k&AjN}W%KnK^M^sn@M+@)JRCDNQ~qNm_@;)me;eV4a!Dw@kS< z^#)hX34CA0;}x$dh9qq3lx=9foX0Bi@PQ*Z4m|LgT5DtELvDh_u?&GCBpADU1=C?FIN3K+5c1u$|M3*t}&3;+NC07*qoM6N<$f|c8- Ar2qf` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_action_home_tl.png b/app/src/main/res/drawable-hdpi/ic_action_home_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..ba1e885b641949b5bd8e88eb9ad22f733db0fe18 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(Fs}7&86hf|(g6)7q54d&d{7u6yZeYLMYn-dYw zD&Sf0(n9Nc0-KM}&V7YFlXsrn$DvU4;NrzAj1sJp1^z~R%3nz6n-=}oYPi8DAEvCI zF!iTU#oH4nOFMU(UfA@^Ywg_=tOA?`?|z8CP7w5Ic*UQ;Q0w@ToyKKxS?WrH4k-tl zlP?O-`)uOsBmPRpn$=IXGE(_V}q6UGBnCw^<%~*{Hw_l}EtRW6ybijDNQ(mK- U)3V2Ff$_)S>FVdQ&MBb@0L{I|4*&oF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_action_users_tl.png b/app/src/main/res/drawable-hdpi/ic_action_users_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..9ec683995eabf6b5a6ddb9671cd333d3696dff28 GIT binary patch literal 829 zcmV-D1H$}?P)beY!Ih*N zvk=+{5)lcN3vnS>E~-UMGQ7SAz7H<1H+SBB^WHSkz3_qIzH`qx-}~;I^WIB1j+6M8 zNmv0^fE8c`SOHdm72rBcB$D7dm;g_~dm_Ilc`aFy0x;UZ3*Zz%Y}zVH0LCEr8X$QW zu^p@k0T`nOiF+9>n*hJFi_s3gmmomawg-t7N&rSDSOREG=DEgL8;sp# z+=;m(55XfgwJOe^;hm8_F~+%BWj8;7o0{aWfVYbMEa%6#Ik!NaA}GxqB$wKtWwZyp z^XY_sWm8^Us#*T>%Dn8}U2qLtEn;G>eH1aryi{Uj0VH!dPlhvec)37 zd$H+LcHS|3k7&>dm@#yi<4z{IzK*+{;W__FwmCPf9FZi~<_u%b_zI9eCLd*A2IL9o z;97atZT2~iDQ_9(e6y_K?+*G38aL|}k&@rY*m%~sGr#!!E=Q@x$F_#omT2p6ZP#CU zrR1M4U*I;&`~i4H4vN@LluZE7?tFxg5iav#KDmSuFcm}cE>p1zz~~N9HB75ocbo#Y zVocs;E3VHfEoDgFr6mpl<7E^uZof`j0akz&U}1CrHRNv^p|(cwQ^% zdT1{&c|{=m3Qm?%kBduAZje}&Yj|O$3!_`xOP>D=W;uM2KP<99!qI@+lbh$9%94|E z-D(0`j;_y@=F5%#keQVBqt*GgKbzW}TOx%SOpdH~ZsmN;IQ-a}-R72z+afc*Hra|T zZy8QaUcmdKI;Vst0D~q`v;Y7A literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_action_globe_tl.png b/app/src/main/res/drawable-ldpi/ic_action_globe_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..bcf0316409322e8efa4ef7fd26c87333d166cad1 GIT binary patch literal 456 zcmV;(0XP1MP)%ErQv9ib$zh?2Zs?n}x-if5-J z3)!J03t6~6r_QZudc*ZRHcWl$%$b?*EK!cyc5UfH5rqp+>0N>AV058?FlPzL=P;$ z5%lWZS_nQA(DVe*1uKr=+fgcL4uLjDVRY(v@-qQ3&R|BX zC~FC%3Is2Md>jE!50P~8>Z^ohL*NBYVA@#M2(P-*rkbItNf8J41qi~>e{bDXV yx#+eW!9!!`{&%nIoKan2Nv`W(d2s$8ec>H|sk^G{717WD00006QAD|cT8Qhv&+Vcf`gm#Cq=AtJgu%U$K1be(*0jL0OTu{LlVt7!@a}|4JZ_pZmvSAMm2Mbt1u00kd=e2^z z4QFjrK&CaPu!i!(a;0QXs@+s(3h?0yA?%niYlEn~x mzM|IQIbaT$>R;wx2D||4Y8Vt_iW?jN0000eIN)XV}TKC<0-Jd>FYXyMu!%)%;{fki#Z<_O=4{Ol7PPk!_Y4Lwhk2}H z8KbzzW$=}xM$pvUn8G#`vV_4;0n`vq0zdmzpLdwX1>W?QoZ>}ec3az_J?7kc1_SJ> zA0pUcn!vD{?TM$cNgT)Qok?=gN_f;2+b!9brp9cp^rMqZRrL_Rdy8yMHB|tW!&8Fh oj;+n538<%N?$rDLX#X_e17j_$_k1+X!T!2kdN literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_notifications_tl.png b/app/src/main/res/drawable-ldpi/ic_notifications_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..3b3d3dc643daa1b7bdf312f147766f5ce50df635 GIT binary patch literal 257 zcmV+c0sj7pP)(xe*_EdDG^!c*vGwM#q&8yf>+@C4pLJdM~oh%~_@21zM9PLFWi(8)u`-s}$jZ(_$%2|lN)nT7)Z}AI zNtDEfQj#Hy3FCk2ygI$!yw`g(6N|a^>%F=6+;ji;ymLQB$!4?4U!s%*lmyu7q$o}h z03n9nokbOZ;s9ZA3ZB6`I0tWl3^E|aHjaV{K=FYDcmlg%QJpbLCkv2}t*;;gP zW8g<;_QW{Y0cT(pw2FSiv^p#a;B|h<@6{asOpd{cLAGrK5ikuZDH_1TdE&GpfHsyD z&T`7|SA)Tq4Wd{BCc!QFv?3tHOQ{{4#9;7x zk+31FpFkae97MU^E7rftCx@9fp(c%=4q+FtnuIdx{G!bbX80`7Mq^6YQ4&6gbHZtL z8K#8eW}Wu9j({!EUMK2Pb~hr`0p);OGdsP6+!i)|Q6ILu6(@v~S<%*?LqJj|g7&sz zaTul9QJm{M20LPw6SYMgRK7wS$K+@ORDgApeId!GV><8SSm#1=XEJ!Fnh7W!htApGe70000wqO7j;4bnxl$(P-ug&vR!&VW9MUjw&l7hysZ20wrA{VO&IN%7T z1zTRm84USes^O@f0TV3WYyNF5waqQ4!HvAoPQ33dz4fv^^SJY*Cupnj&y$Yzj1_ z$Z8RxB)YyYd=IXd^Da*jzl3d@LR>7f`vBn%46BrF?11i=|-f*Y^{JfPl#fjV<`snMin z(9i(F2OcD`GD!ANTt(!ZOJhRYXJjC&BXkHd77S#%=w*!zRCE%Sz^MfTB4!wT55U_j)oN?JlYZ)6|}UO-4Q76NgKcEE`V9nOvG=m_no*(peYdr$(`+=L^b zO5tgPqdLVoRpykbQKDwb>=cOhx(OD*4BM<&$7K*<8+tj0M9(th~RT#Fh3Jp%=kP4&!m^ze9H za#OWah*RxfG(oxR~dXu9KWI#++_?qL%Z=-vWe}tyKL5 zcc2K4NReaeb1~ODkdF}}1{xOnfXIpUWdPyVY%nW`Tz@|Xa(xt6$yqYMjoBE0frh%_ g?0?0!0o#BcUyomS?a1N6i~s-t07*qoM6N<$f;h+TG5`Po literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_notifications_tl.png b/app/src/main/res/drawable-mdpi/ic_notifications_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..81d09aef70e6efd49fd5dfdc851971481b97f157 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|miacE$Ln>}1Cn#`lU{G{a-QFm$ z-YBh2rR~4N43?CK3`soV2fZ9VC^c)8xw1d-awyO@Q&rROa=0K79B9?H$i&C>t3=l; z15wiijjRQ8l~~)@CA#DoTmu=F33V8WJZNA}V!f9jyyxR`CbtDl`3jy^3=G!3Nvndo SGeUs2GkCiCxvXv27_WMih}4%EYiGaR0Oqou(T9R8%2F7)Dp3_5vf?P7A-+; z#m^Xh@S#YQNMp4n{YasfwqUU$m1v9gyWg$Wdi@{y4-CW1-rc*Iy*G9iek6By=IqXY zXU;h@JGnxkkUO8r1p$HpL4Y7Y5FiK;1PB5I0es&mm#YEopc||Jc`!)i|6X2`GBy7T z0dUlVPA~wDfI>`;u#VKNpKt=;r~^Gk8hsZ00RE04hS;jBcmZ%!gD!ATYrqJ21S|(1 zgU7+OQkHeD2Cv8H6$fd%x*`R@(Ex^xhaTqm{sVjlE^^dem0);?&4!8+07onMh7Y(G z{0^Q4v%pI53$J}`j%gfIwd*#-?rzJu)`}1S$82q^ZvxHWUN9eQzs$ZU zVFe2EFqi~B0GEIn;5~2|Sg(oDS{4B~=2f>BCw4Jdr@hGzun2r-yjf|)xroT{7kFFz z1;gku=?RvcVzV|J8Zs4tT~awb>DIM;*b$!lQY+h*z`-2=Yv@D1056O4bUeeA;IQTx ztFsiKi#PsN!kBSwu^zM8jn~9zy!4!9panb!ZU*;6Wrg%VDv#*OL;xl^D$dWbT%W|h zEsXvBU_;Cva1<;^k_zK^M#~fGvJjw$H{7in>nK-ChbZIy+n56U44O(9j$^Ff<5d8T zbLI6Pj3_6bdWaz|?)cwDe=!BjrKguD(-Gsjp3R? zsqR11kr#YkV&hdrxz4b88`J0K!A5XMvP#GEwQ0kk#)kmyDofMONwP8zJfwN!QaB^2 zvCGL7d9JJY_d+I7@}u2{0NpgcUh@YhwHUrPg#b^c$VfkBb~z2~qrGk)0`$`OV*VaY z(O{k5(kyo1XcWJ|p`vW|`Vc@(U>5TCAoKCQlmhG+hZ*Sw%psJ`ybl2eX?%=R(<&k! z`_B{tEKk|^M&=y4%|V|66zFW$a>gf_*j6o+?Mo=Yx)hDS-ZIQZ zEnW(iSQa^K$a=svDc2xPn|Ys3(8ea^9F010CqXi&pAIIoQH=?nYoo7QqrW+i#x_u@>HY8x zG3sBzMa|O*M3@_4@9BsSDK)+)LnV81E`X*Ek<0*Xbq2DS4%=38X2i6yG=Ts^B?!=& z)q;q1K3}AMb3$LRC&Jc;j_zNd)smQPQS*r+b#F=N2;YrJeQhDOC+kH~8}lRT-kMN= zH*C{iE}z*xp4Mf(ENd@-&r z=ch3iAC&o6puu(E>l?|Jvg8)H*AV3fx2oMAa0t5jj4F3WQ_-}BigJy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_home_tl.png b/app/src/main/res/drawable-xhdpi/ic_action_home_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..4417d8fcdf5186fdbbf73b7cfffca838f74b67b5 GIT binary patch literal 716 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4Cdd;uunK>+LLm50OBbJl?e~_?(4^10ymr zEO}>P>J-W4u;gIRBt31$j<^ksF|Kysr|n^IF_kdoI`4Kabovqo7vmp^n)jTGW_f!t zEaG0%rU7K{?uuhj;%w7x{TE&|cY5|@S51bCEc+t5qM5=S+Uw3uRnIjMoyy>%9zv-u43b#}@h z)I4j;GLQ97lgEA0jT{bFn)#iJ4ruz#rf3?F4jMC zC9jBhNS2@c+pzmcep$PN(`^g(x~Na7I&UX(Phf0hoUoB6jYsCT#V<6S|Ta zef+=+_znHO$Mc2oK<>LA1RKBZUs_%EhwPwSNPCsg(P z({JQ_U#UEw-^u;pX&bS5XSruiu$a%XJXz=7#KJ-sQ fP74tBy3M?sq8v=-?u}9arcwq^S3j3^P6baZ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..8330693ba533d2604eceba17913c7195ce4affbe GIT binary patch literal 1129 zcmV-v1eW`WP)|dPu}pr%LEjt8nzWKFMXp|p#r|9E$l84bD|ppEGPul1>1=jCeN9GuPz1K1xEtV=umL- zhsc5bjt2tlz*i1@N3!p*B>>x0hyw)&yRa|xAbCz9eC{gP9$0SL76Ozg1`~pPwTA*! z!)Hj*zQm3Ior;q$!M@c)0b1d6NzuO3jsQc7lP|-**+T)E;d5Ehe#njh4T_Vm!@kTz z0m|TWUD3Y5jsUESyW;OTmYWeXuuqRrE4T&okq)0T7IE?Y;mWG3jC2exif6Av&9LHu z04s{I@S0@NNga@jV}w;;K@*!I;hh|ig8hZY$O%8CIR}J2r^qCxAYx{*=Q^zf8<7b6 zW}A44lJ`EYvrdJ5Al;xCs&UX&%17&tu>3dRdknEuAhvBm{6<%rAsTrWN6sG6%Zm*f zO~T&6_&_AtNd6Y_R+xv)*(4Ncz3^>#G_#mp>jr7u7KC_63=_|Ydfo|29pR)D(0i*^ z*1%s9@kW|sQtSkUj<6oF3?sHYF=nT|0K36`jivUAD3=l~AfBKlJtGE%S7A#^;2R58 zA^A$;i}dW4u=EGvYZbopr53pyv7RFK47jt)6gw>=*t^Ls$Ws1d}gt*Do!H3=Wj`=GU z>ud1>e43ZI&3#U!Me%$Zp4r44Y_0;||6KqpXcWhkto{+|^QZVE@8A=sD+ v{{*!FS^zD87C;N21<(R$0ki;GfSbubb^AQz;Kbvd00000NkvXXu0mjf3+4PW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_notifications_tl.png b/app/src/main/res/drawable-xhdpi/ic_notifications_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..0c22d492663c7ed8816e141015c01eae43948277 GIT binary patch literal 243 zcmV zSzyqcQ#~w$qq6X8+`GW5B8H;w$P9a28M+|Fv zjB##cs!kZ`pj9hVwbVgJ5jyCgT!eBRbQhtU4k|^c&_PboANo-!Q9(&Rj7aGjfpVU; tT;$g`X89X73^ELvFla)6r3}4>x)*;`j!IeY#cKcn002ovPDHLkV1oPmV=e#y literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-xxhdpi/ic_action_globe_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..a51cef2021b48e2509342b9983a977509739df10 GIT binary patch literal 2138 zcmV-g2&MOlP)p51z=bJ7Jy*^SOA6vU;!8wfCaFlfH^t&Km||()Bz1Z zBai^vkOUrUz-wyoo_rR-pV5neYM==?0VI8L0@Dy_6|n$%qZa_Rz~%r3cVjc=QNRNH zXZSoc$^jn+J?T@31DI!CyA=R_xj+@L%fUd$fmuK)up5v41S|w50i%Gkflk2Xz-zz} zA42THGUT=^0pM4L29*u60k|0rd?)ZBcBsV$Y0eDLG>Nj5WxW9K>j2DEG#!WW-0S50 zcP7Tiw7(44Kb*w;J7lE*@aqn&QarqP^B)7&I*fWmdtK?0_9Y>9)S`^tvq}K?6#~uD zgFXq|4;%x|1-fAk5$*aE2g979NP7hEfuV7C0`^c|wCg;^m0{6emJ|pQKb20w=Kre^#bq1#4gzmW1L66R8 z0r1VI#@`E+kn>`cb2_jC&o9NdvmR%(srxF(J@bHrl5v*<=U}JpWcTC*!{-hOETk zUjxsOa*8Hz68T#ep*hMvAz2G6iuN^@>T z2!N9;+Dt5x&X?fKRdkv^iw;ma-^u5jo=wvl6F6wcqMVN zSBx%>5+BbvO3JI&CIRR&;v*i~{a2)_9h4)|WH2F}--^TJ2Z4))Tf^gXenOWwtq=eg z(5cTQ&+xvlB3SbkE`+IQ{JRw1(B0Ta%$NO424$WmrB`Hw0M(>Gs}1kDEW(BNB)S?F zqub+B;39nM4=N%j_F$(!%%$9&B{xd74FWWg0^MhDeYrHb2^-;h=%&c~8WiDobWgO9 z`#ut$S%dN~Aon!IDgaKJ=nB?Im+L14jPr40n`(kb%5W7hi1ZU;z2Z8ctKl~a5G`^U5kBGpxb(6yyN78AnA`Ss+NI}++;}-(INCg$0 z-`f!iP#TeE_f4DwJP-86W51GoYvL53&dK!vzi%S$WM!HnTv$32SK8L0Csiz&9wK?y z#VJ4oDacqn)+OS0-ifIZFRk`MAr?C1-4Le$jiew0@mNQ)9%tnUdYKAq6ni*#3?|VWQfOw(H%OmKO+?2r8F2{#H0S9 za{k#O0QJR-$bz2ax_hN-{s|D-{J$Woh>ic8oA=e0CMfA(dllA$W&6>O$Z5f8T zg@50!n=DDQYCpUsMqm*bf22#k4Yo|gOxU7Hs|yZWgG}P;F|CQ{?_Y#X$TYvvZ5S@8 z%d^fFSA+?V8cuqG^bM<|(85zS#HX|Ipi6!=wm9S55D{sE4b!a*d8N#AQ-Lpn$)Zt( zP3~wNwI0(Rgw_9eNCGVNnEwL9NnpNB3o<%p`%Hf*#tenwUz%u`XFr3cC;kN)hb2iJ z#R2m<&(J73Dt)f~s<2{7vdFNoHw4V5BTnvu2rxb5zAgSmd55qR72k_R?Era<3!w>G zAEE$ugr#WQv`)b^|R_mTeHA&rDyHO#NrAOhQ- z&_s{5AYnQmAZgzgk^l=0^SdJ*Z-3O`={j0dp&^E8mxm<4vo84vcgPC{wb;J!bRU7X zYdxg9C?o-vx#aVXK^k^`prQCgNyl~%!`%HL39wJs31j4(n^)J~Pm~lN=_!Y$F6j(# zS@7}8WJP{G@S9@Y;=kP=>1jSwb>cVO2Xo{z)38~sihy&uFEc(KPboDa1XTNM~j%+Me$5k^w<_2Bu;ysZi}n{~(xQ`|Q`;#i_#7&t6qme#lo zIWu#!4$XEor{)5RrfX%0YXB-X8EkKp`PtrrvSY(0gDuP2 za3hW0_>EcI#?QVj%M3T|I~ud$vwPD%!)+_$qJ3;z>0#s6bkROHZVhqkV!!a##k_ep zZ(q*>@IP?ie__G`umEfX7Jvm{SO6A)VF6eGh6P{&7#4s9U|0YafJqDg0&&V3^CYA{ Qr2qf`07*qoM6N<$f_PHi;{X5v literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_home_tl.png b/app/src/main/res/drawable-xxhdpi/ic_action_home_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..378a25f42baeac14ff27ac0663537cb659a1449a GIT binary patch literal 1067 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VE*Lk;uunK>+P({4&OkT~4RQgQn@Is(79-IyK2&<>aKTioYk- z%CCEWa%ZXRbKB>8cIMyP`@Yt{_TS8%-}jX7pI?6d@7&_NBZYG~Jmq*AnKT*#7+3|k z7BDz5ia2OAFmbR3Ff3%?QV>ZfV4Uco%jMzs;p;)U0?8*q4qw~u%idw>d!j4h&v;e% zU&x1(!uzI|CQ45_BvK>0LDlO+oL<8>kq7xd<{lJn{tz42sKoU_{SW7ZxvoF-_B&{v zSkPc`+Ixdt--A%U<}i^2@jAX8FPwkq`5#Q+GT^RPsd$_GLvLz=;0i~^Uk{8AXjzuc zZmVLJ*(OrRVzRVh|Kam&={n7KSYMs|{JdFS?71C7t>y#&3g-jH-5>TfMb4^YYjPL+ zTf<&_IjljV`(To#+3dD5{x4k@)42-{ee%1-F12hb!J|DA;IL|Hoo?g54u;Lk(#jb&whbD8-C2uPjK_%cF>-dygpMS z$wz*{mq6*9OET4BTLSxX+0RAa%d~d5J4HyLjj!NuIH}z(TH_ljQ!UAo;_#(60YaFYZxXw=`!RllZp1#kNVTp zo_Ve1)T0?c^*)R{a(LhVwD`o$srJ(yjt6i| zSo*N^bn4@)v$WDIDqbFzno#jVJbT}B5r5ItL(&Fj7nr78y6|Puv5Z$gM5mSR;rxA- zQ#{Ii=e(55=cB$JpH#wV=;gfnw$xfximTUq5$E(QH<|EtU_W84i8lF1me%**J)bSw8P{`~DcV_N Fz`>#wr@!@mI%;zmKhL$=UiyLlh3hXP7-covl zC1lA221j;a<^ZFHEg}NPp9eDla|p3$$uf+5<-pj2n(5}8$X7ip)756ydJk9#FnGH9 KxvXi_zX}!nfo72sIwJ&$`opF}Y^F2wpT*L@l&r8xM2&=?LM28S z+JBbK9|fWi+F%P~i5eJ!8rk}_O{TMSZ|9-!jpM_;ckli2-1oWf&V?_!?S0NY=X~Dx z-sd^zxo=T6n=KOMPm%-yAOJ)HKmdpYfB+B)00AHp00KZH00e+Y00;n)01yBo0U!YE za=56dlr)jFfb=Z10KY300P!b0Lwba?gVaqLB4s@^gxBoAn2Z1jpZL+FCeme}gb%07 zurXQy1bfHVlP*L^ysitdnGpc~$uB2;8DrvgDcj`&z&-hsNIw`%z9V&xNdn-`RfXLz<6^6_&DVrfQfD-mlZ?*QnSPC7*D^$GAB6@bgwLlz|8(IFTA zmce(gF};Xkdg1`^j(?eSBS4T_+4#j4CEw9v=HJ!;<8B}qnM454Q9(KpBEVW^W3Pn( z_A>u!LyT8BsYn9A{t(XnNh-nk68vl%fH-{IZxjF>bs>Y>$80RIF!_#_FhBQ&v{7dS z03B7N-$FX|BD2$KF@RR)=Z26rRF0}l0N55Gu&0=v0~Q1LT$=@jwX@9xfGCN3nAz#D z7(f^Eb4~<12TTCC6v3gInCzI=Rp#e}2zD;T3Lv60S>CIqW6)v%s-;=X);dvE>J#Dw zFfU?YmCRO;#Q=J>=1>${^Wp?BhV)MaXJ#^6-&+je4D)kZ1Uo8MW8%ICbVqRLNoMD; z#Q=`Rv|i~paT9Kf;Lvl-&TfkV>}Gzhj$o(F1b{|%g1>_-HZ(i+76Ygc8B-N<;@D|4 z0bmsATes?FKxfBm&e|g7)A*1v@#?9{(I`{3Aa!H9juYKdAJZJiP34tBI==Qu!dD4& z;f@Y>Zd81y=4fv*lQZR zj=k=GpPhAqi>*q;&esZ?k|;-K;23Yl^poBvttUNBT1)znbdJ5|9J8Uyz2`j=(QFXF z3m)e@@06nPx;y+vENcdcq|r+kUJTG3;8X)Q7^Gxm0XoFsd~6>isRI>xHXCojHff4^V*d9qKB;ksKhKZLK3k^b_j z-B0%Ok^Q~~v5ocE$$hVJ07&pFc!&Oi9zkUe4^%X$Qm-@H(5j=0e5R%9-L{AHK*%@A zo4A>JO*kzR8H6xTXnDNf|JE8sX1wS}|_*U;uT zvrJp$`8{}{DyTbiS^Uv)H|Y)Svf)QU~d6%<=njuu-R-`!fTJx`tQ);0cohPE4V%^44DO=@${Vvo0l=O8bW+W5 zeV4N8A&}Z*u-(r45o}j>Qf2Yee$S}+0a%legFlg0`1qkfyy|h2^lYwU%uFA<&yaph zD8@Bm030;z)E}rTl?IrJsj1@Aq>bwSf!W9&{C^|%I_@LAj>TgZ zed#Ag{4-*7Jmjn3(l&yQe#KIs#mclH;`hY<$=vygWKOmVxhSZcunY$0D2qb0Zy ze`~>Oy8}!WcjoI^v3xy@eIll7YhMm4-yr+@%L^I+idUUQ_BQ1^hbu0o767J@XDv>? zqq9M#vZ(-oy8p!#B;V0Ry-$!@0BG@@Oi}V3o%CwRrwu?;3X|`sDb)b*HDcFN3_$rl zG0gyuq&WGGj-(O*+IQIk(W*28I95Oaj-?8K+M=QD5lXvmh23_NF93}Nl>ES3&TRnD zUVs4FQvtwmGbf)KG*PUR?{AiGO%wnk0U!WG0zd$W1b_e#2><~g5&!}~Bme|}NB{@` dkpL)c{R^IQP^Ga4#rgmM002ovPDHLkV1j!UI$i(( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png b/app/src/main/res/drawable-xxhdpi/ic_notifications_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..bb99098c84afaf7e42d787b5d4ed5ed591e8e41c GIT binary patch literal 349 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_home_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_action_home_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff620776694693016a6c012d49af1499e1235bf GIT binary patch literal 2470 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 JYiuv1{tJrdg_-~W literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png new file mode 100644 index 0000000000000000000000000000000000000000..29767b9d09d2c9f853eeeba58af9d89e2e7289e6 GIT binary patch literal 4179 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 KMNUMnLSTaKCb3ok literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index baa8b57d3..a9464dab3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -45,7 +45,7 @@ android:orientation="vertical"> + android:icon="@drawable/ic_action_home_tl"/> + android:icon="@drawable/ic_action_users_tl"/> + android:icon="@drawable/ic_action_globe_tl"/> + android:icon="@drawable/ic_notifications_tl"/>