Skip to content

Commit

Permalink
Solved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@wokija
wokija committed Jun 6, 2022
2 parents a824531 + b48ffa2 commit 841789f
Show file tree
Hide file tree
Showing 16 changed files with 155 additions and 38 deletions.
9 changes: 6 additions & 3 deletions app/src/main/assets/appfilter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3380,6 +3380,7 @@
<item component="ComponentInfo{com.lookandfeel.cleanerforwhatsapp/com.lookandfeel.cleanerforwhatsapp.SplashscreenActivity}" drawable="cleaner_whatsapp" />
<item component="ComponentInfo{com.looker.droidify.neo/com.looker.droidify.ui.activities.MainActivityX}" drawable="neo_store" />
<item component="ComponentInfo{com.looker.droidify/com.looker.droidify.MainActivity}" drawable="droid_ify" />
<item component="ComponentInfo{com.looker.droidify/com.looker.droidify.ui.activities.MainActivityX}" drawable="neo_store" />
<item component="ComponentInfo{com.loudtalks/com.loudtalks.client.ui.App}" drawable="zello" />
<item component="ComponentInfo{com.lovatos.rankey/md50ad78a617d08d4f6b096db150e198c4f.SplashActivity}" drawable="rankey" />
<item component="ComponentInfo{com.lovejoy777.rroandlayersmanager/com.lovejoy777.rroandlayersmanager.MainActivity}" drawable="layers_manager" />
Expand All @@ -3402,7 +3403,7 @@
<item component="ComponentInfo{com.lynxspa.prontotreno/com.ibm.android.states.startup.StartUpActivity}" drawable="trenitalia" />
<item component="ComponentInfo{com.m1finance.android/com.m1finance.android.controller.SplashActivity}" drawable="m1_finance" />
<item component="ComponentInfo{com.machiav3lli.backup.neo/com.machiav3lli.backup.activities.SplashActivity}" drawable="neo_backup" />
<item component="ComponentInfo{com.machiav3lli.backup/com.machiav3lli.backup.activities.SplashActivity}" drawable="oandbackupx" />
<item component="ComponentInfo{com.machiav3lli.backup/com.machiav3lli.backup.activities.SplashActivity}" drawable="neo_backup" />
<item component="ComponentInfo{com.macropinch.swan/com.macropinch.swan.WeatherActivity2}" drawable="weather" />
<item component="ComponentInfo{com.madbarz.madbarzApp/com.madbarz.madbarzApp.MainActivity}" drawable="mad_barz" />
<item component="ComponentInfo{com.madbarz.madbarzApp/com.madbarz.madbarzApp.TelerikCallbackActivity}" drawable="mad_barz" />
Expand Down Expand Up @@ -4514,7 +4515,7 @@
<item component="ComponentInfo{com.safeincloud/com.safeincloud.EntryActivity}" drawable="safe__in__cloud" />
<item component="ComponentInfo{com.saggitt.omega.dev/com.saggitt.omega.OmegaLauncher}" drawable="omegalauncher" />
<item component="ComponentInfo{com.saggitt.omega.neo/com.saggitt.omega.OmegaLauncher}" drawable="neo_launcher" />
<item component="ComponentInfo{com.saggitt.omega/com.saggitt.omega.OmegaLauncher}" drawable="omega_launcher" />
<item component="ComponentInfo{com.saggitt.omega/com.saggitt.omega.OmegaLauncher}" drawable="neo_launcher" />
<item component="ComponentInfo{com.saladevs.changelogclone/com.saladevs.changelogclone.ui.MainActivity}" drawable="changes" />
<item component="ComponentInfo{com.samco.trackandgraph/com.samco.trackandgraph.MainActivity}" drawable="track_graph" />
<item component="ComponentInfo{com.samruston.buzzkill/com.samruston.buzzkill.ui.MainActivity}" drawable="buzzkill" />
Expand Down Expand Up @@ -7928,4 +7929,6 @@
<item component="ComponentInfo{com.sujanpoudel.adbwifi/com.sujanpoudel.adbwifi.MainActivity}" drawable="adb_wifi" />
<item component="ComponentInfo{ru.ufanet.smarthome/ru.ufanet.smarthome.MainActivity}" drawable="ufanet_home" />
<item component="ComponentInfo{com.ncloudtech.cloudoffice/com.ncloudtech.cloudoffice.android.myfm.launch.LaunchActivity}" drawable="myoffice_documents" />
</resources>
<item component="ComponentInfo{com.jdlf.compass/com.jdlf.compass.ui.activities.util.LauncherActivity}" drawable="compass_school_manager" />
<item component="ComponentInfo{com.samsung.android.spdfnote/spdfnote.control.ui.filemanager.MainHomeActivity}" drawable="write_on_pdf" />
</resources>
4 changes: 4 additions & 0 deletions app/src/main/assets/drawable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@
<item name="Nekogram" drawable="nekogram" />
<item name="MyOfficeDocuments" drawable="myoffice_documents" />
<item name="My Smart Home" drawable="ufanet_home" />
<item name="Compass School Manager" drawable="compass_school_manager" />
<item name="Write on PDF" drawable="write_on_pdf" />

<category title="Google" />
<item name="Accessibility Scanner" drawable="google_accessibility_scanner" />
Expand Down Expand Up @@ -1690,6 +1692,7 @@
<item name="CommSec" drawable="commsec" />
<item name="CommSec Pocket" drawable="commsec_pocket" />
<item name="Compass" drawable="compass" />
<item name="Compass School Manager" drawable="compass_school_manager" />
<item name="Computer Launcher Beta" drawable="computer_launcher_beta" />
<item name="Concepts" drawable="concepts" />
<item name="ConnectBot" drawable="connectbot" />
Expand Down Expand Up @@ -5469,6 +5472,7 @@
<item name="WPS Office" drawable="wps_office" />
<item name="WPS Office lite" drawable="wps_office_lite" />
<item name="Write by Voice" drawable="write_by_voice" />
<item name="Write on PDF" drawable="write_on_pdf" />
<item name="Writer Plus" drawable="writer_plus" />
<item name="Wulkanowy Dzienniczek" drawable="wulkanowy_dzienniczek" />
<item name="Wunderlist" drawable="wunderlist" />
Expand Down
Binary file added app/src/main/res/drawable-nodpi/compass_school_manager.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-nodpi/neo_backup.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-nodpi/neo_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-nodpi/neo_store.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-nodpi/write_on_pdf.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 6 additions & 3 deletions app/src/main/res/xml/appfilter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3380,6 +3380,7 @@
<item component="ComponentInfo{com.lookandfeel.cleanerforwhatsapp/com.lookandfeel.cleanerforwhatsapp.SplashscreenActivity}" drawable="cleaner_whatsapp" />
<item component="ComponentInfo{com.looker.droidify.neo/com.looker.droidify.ui.activities.MainActivityX}" drawable="neo_store" />
<item component="ComponentInfo{com.looker.droidify/com.looker.droidify.MainActivity}" drawable="droid_ify" />
<item component="ComponentInfo{com.looker.droidify/com.looker.droidify.ui.activities.MainActivityX}" drawable="neo_store" />
<item component="ComponentInfo{com.loudtalks/com.loudtalks.client.ui.App}" drawable="zello" />
<item component="ComponentInfo{com.lovatos.rankey/md50ad78a617d08d4f6b096db150e198c4f.SplashActivity}" drawable="rankey" />
<item component="ComponentInfo{com.lovejoy777.rroandlayersmanager/com.lovejoy777.rroandlayersmanager.MainActivity}" drawable="layers_manager" />
Expand All @@ -3402,7 +3403,7 @@
<item component="ComponentInfo{com.lynxspa.prontotreno/com.ibm.android.states.startup.StartUpActivity}" drawable="trenitalia" />
<item component="ComponentInfo{com.m1finance.android/com.m1finance.android.controller.SplashActivity}" drawable="m1_finance" />
<item component="ComponentInfo{com.machiav3lli.backup.neo/com.machiav3lli.backup.activities.SplashActivity}" drawable="neo_backup" />
<item component="ComponentInfo{com.machiav3lli.backup/com.machiav3lli.backup.activities.SplashActivity}" drawable="oandbackupx" />
<item component="ComponentInfo{com.machiav3lli.backup/com.machiav3lli.backup.activities.SplashActivity}" drawable="neo_backup" />
<item component="ComponentInfo{com.macropinch.swan/com.macropinch.swan.WeatherActivity2}" drawable="weather" />
<item component="ComponentInfo{com.madbarz.madbarzApp/com.madbarz.madbarzApp.MainActivity}" drawable="mad_barz" />
<item component="ComponentInfo{com.madbarz.madbarzApp/com.madbarz.madbarzApp.TelerikCallbackActivity}" drawable="mad_barz" />
Expand Down Expand Up @@ -4514,7 +4515,7 @@
<item component="ComponentInfo{com.safeincloud/com.safeincloud.EntryActivity}" drawable="safe__in__cloud" />
<item component="ComponentInfo{com.saggitt.omega.dev/com.saggitt.omega.OmegaLauncher}" drawable="omegalauncher" />
<item component="ComponentInfo{com.saggitt.omega.neo/com.saggitt.omega.OmegaLauncher}" drawable="neo_launcher" />
<item component="ComponentInfo{com.saggitt.omega/com.saggitt.omega.OmegaLauncher}" drawable="omega_launcher" />
<item component="ComponentInfo{com.saggitt.omega/com.saggitt.omega.OmegaLauncher}" drawable="neo_launcher" />
<item component="ComponentInfo{com.saladevs.changelogclone/com.saladevs.changelogclone.ui.MainActivity}" drawable="changes" />
<item component="ComponentInfo{com.samco.trackandgraph/com.samco.trackandgraph.MainActivity}" drawable="track_graph" />
<item component="ComponentInfo{com.samruston.buzzkill/com.samruston.buzzkill.ui.MainActivity}" drawable="buzzkill" />
Expand Down Expand Up @@ -7928,4 +7929,6 @@
<item component="ComponentInfo{com.sujanpoudel.adbwifi/com.sujanpoudel.adbwifi.MainActivity}" drawable="adb_wifi" />
<item component="ComponentInfo{ru.ufanet.smarthome/ru.ufanet.smarthome.MainActivity}" drawable="ufanet_home" />
<item component="ComponentInfo{com.ncloudtech.cloudoffice/com.ncloudtech.cloudoffice.android.myfm.launch.LaunchActivity}" drawable="myoffice_documents" />
</resources>
<item component="ComponentInfo{com.jdlf.compass/com.jdlf.compass.ui.activities.util.LauncherActivity}" drawable="compass_school_manager" />
<item component="ComponentInfo{com.samsung.android.spdfnote/spdfnote.control.ui.filemanager.MainHomeActivity}" drawable="write_on_pdf" />
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/xml/drawable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@
<item name="Nekogram" drawable="nekogram" />
<item name="MyOfficeDocuments" drawable="myoffice_documents" />
<item name="My Smart Home" drawable="ufanet_home" />
<item name="Compass School Manager" drawable="compass_school_manager" />
<item name="Write on PDF" drawable="write_on_pdf" />

<category title="Google" />
<item name="Accessibility Scanner" drawable="google_accessibility_scanner" />
Expand Down Expand Up @@ -1690,6 +1692,7 @@
<item name="CommSec" drawable="commsec" />
<item name="CommSec Pocket" drawable="commsec_pocket" />
<item name="Compass" drawable="compass" />
<item name="Compass School Manager" drawable="compass_school_manager" />
<item name="Computer Launcher Beta" drawable="computer_launcher_beta" />
<item name="Concepts" drawable="concepts" />
<item name="ConnectBot" drawable="connectbot" />
Expand Down Expand Up @@ -5469,6 +5472,7 @@
<item name="WPS Office" drawable="wps_office" />
<item name="WPS Office lite" drawable="wps_office_lite" />
<item name="Write by Voice" drawable="write_by_voice" />
<item name="Write on PDF" drawable="write_on_pdf" />
<item name="Writer Plus" drawable="writer_plus" />
<item name="Wulkanowy Dzienniczek" drawable="wulkanowy_dzienniczek" />
<item name="Wunderlist" drawable="wunderlist" />
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/res/xml/theme_resources.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3296,6 +3296,7 @@
<AppIcon name="com.lookandfeel.cleanerforwhatsapp/com.lookandfeel.cleanerforwhatsapp.SplashscreenActivity" image="cleaner_whatsapp" />
<AppIcon name="com.looker.droidify.neo/com.looker.droidify.ui.activities.MainActivityX" image="neo_store" />
<AppIcon name="com.looker.droidify/com.looker.droidify.MainActivity" image="droid_ify" />
<AppIcon name="com.looker.droidify/com.looker.droidify.ui.activities.MainActivityX" image="neo_store" />
<AppIcon name="com.loudtalks/com.loudtalks.client.ui.App" image="zello" />
<AppIcon name="com.lovatos.rankey/md50ad78a617d08d4f6b096db150e198c4f.SplashActivity" image="rankey" />
<AppIcon name="com.lovejoy777.rroandlayersmanager/com.lovejoy777.rroandlayersmanager.MainActivity" image="layers_manager" />
Expand All @@ -3318,6 +3319,7 @@
<AppIcon name="com.lynxspa.prontotreno/com.ibm.android.states.startup.StartUpActivity" image="trenitalia" />
<AppIcon name="com.m1finance.android/com.m1finance.android.controller.SplashActivity" image="m1_finance" />
<AppIcon name="com.machiav3lli.backup.neo/com.machiav3lli.backup.activities.SplashActivity" image="neo_backup" />
<AppIcon name="com.machiav3lli.backup/com.machiav3lli.backup.activities.SplashActivity" image="neo_backup" />
<AppIcon name="com.macropinch.swan/com.macropinch.swan.WeatherActivity2" image="weather" />
<AppIcon name="com.madbarz.madbarzApp/com.madbarz.madbarzApp.MainActivity" image="mad_barz" />
<AppIcon name="com.madbarz.madbarzApp/com.madbarz.madbarzApp.TelerikCallbackActivity" image="mad_barz" />
Expand Down Expand Up @@ -4429,7 +4431,7 @@
<AppIcon name="com.safeincloud/com.safeincloud.EntryActivity" image="safe__in__cloud" />
<AppIcon name="com.saggitt.omega.dev/com.saggitt.omega.OmegaLauncher" image="omegalauncher" />
<AppIcon name="com.saggitt.omega.neo/com.saggitt.omega.OmegaLauncher" image="neo_launcher" />
<AppIcon name="com.saggitt.omega/com.saggitt.omega.OmegaLauncher" image="omega_launcher" />
<AppIcon name="com.saggitt.omega/com.saggitt.omega.OmegaLauncher" image="neo_launcher" />
<AppIcon name="com.saladevs.changelogclone/com.saladevs.changelogclone.ui.MainActivity" image="changes" />
<AppIcon name="com.samco.trackandgraph/com.samco.trackandgraph.MainActivity" image="track_graph" />
<AppIcon name="com.samruston.buzzkill/com.samruston.buzzkill.ui.MainActivity" image="buzzkill" />
Expand Down Expand Up @@ -6722,7 +6724,6 @@
<AppIcon name="maa.vaporwave_editor_glitch_vhs_trippy/maa.vaporwave_editor_glitch_vhs_trippy.ui.activities.essential.SplashScreen" image="vaporgram" />
<AppIcon name="maa.vaporwave_editor_glitch_vhs_trippy/maa.vaporwave_editor_glitch_vhs_trippy.ui.activities.SplashScreen" image="vaporgram" />
<AppIcon name="maa.vaporwave_wallpaper/maa.vaporwave_wallpaper.Utils.SplashScreen" image="wallsplash" />
<AppIcon name="machiav3lli.backup/com.machiav3lli.backup.activities.SplashActivity" image="oandbackupx" />
<AppIcon name="mango9.com.sleepybox/mango9.com.sleepybox.MainActivity" image="sleepy_box" />
<AppIcon name="mark.via.gp/mark.via.Shell" image="via_browser" />
<AppIcon name="mark.via.gp/mark.via.ui.activity.BrowserActivity" image="via_browser" />
Expand Down Expand Up @@ -7846,4 +7847,6 @@
<AppIcon name="com.sujanpoudel.adbwifi/com.sujanpoudel.adbwifi.MainActivity" image="adb_wifi"/>
<AppIcon name="ru.ufanet.smarthome/ru.ufanet.smarthome.MainActivity" image="ufanet_home"/>
<AppIcon name="com.ncloudtech.cloudoffice/com.ncloudtech.cloudoffice.android.myfm.launch.LaunchActivity" image="myoffice_documents"/>
<AppIcon name="com.jdlf.compass/com.jdlf.compass.ui.activities.util.LauncherActivity" image="compass_school_manager" />
<AppIcon name="com.samsung.android.spdfnote/spdfnote.control.ui.filemanager.MainHomeActivity" image="write_on_pdf" />
</Theme>
1 change: 1 addition & 0 deletions contributed-vectors/compass_school_manager.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 114 additions & 15 deletions contributed-vectors/neo_backup.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion contributed-vectors/neo_launcher.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion contributed-vectors/neo_store.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 841789f

Please sign in to comment.