Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa262888 authored by Michael Bestas's avatar Michael Bestas
Browse files

Eleven: Complete Apollo rebrand. 

* Fix remaining Apollo references

Change-Id: I7f0efcec2658f22467ba8aa5e08e7022bedfab1b
parent 869ef7ee

res/values-fi/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
  <string name="app_widget_small">Musiikki: 4 \u00d7 1</string>

  <string name="app_widget_large">Musiikki: 4 \u00d7 2</string>

  <string name="app_widget_large_alt">Musiikki: 4 \u00d7 2 (vaihtoehtoinen)</string>

  <string name="app_widget_recent">Apollo: äskettäin kuunneltu</string>

  <string name="app_widget_recent">Eleven: äskettäin kuunneltu</string>

  <!-- Empty list / error messages -->

  <string name="no_effects_for_you">Taajuuskorjainta ei voitu avata.</string>

  <string name="empty_music">Kopioi musiikkia tietokoneelta laitteeseen käyttämällä USB-kaapelia.</string>

res/values-ku/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
  <string name="settings_download_missing_artwork_title">دابه‌زاندنی ئه‌لبومه‌ هونه‌رییه‌ ونبوه‌کان</string>

  <string name="settings_download_artist_images_title">دابه‌زاندنی وێنه‌ هونه‌رمه‌نده‌ ونبوه‌کان</string>

  <!-- App widget -->

  <string name="app_widget_large_alt">Apollo: 4×2 (alternate)</string>

  <string name="app_widget_large_alt">Eleven: 4×2 (alternate)</string>

  <string name="app_widget_recent">ئه‌پۆڵۆ:تازه‌ترین که‌ گوێلێگیراون</string>

  <!-- Empty list / error messages -->

  <string name="no_effects_for_you">یه‌کسانکه‌ری ده‌نگ ناکرێته‌وه‌.</string>

src/org/lineageos/eleven/MusicPlaybackService.java

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ import java.util.TreeSet; 


/**

 * A backbround {@link Service} used to keep music playing between activities

 * and when the user moves Apollo into the background.

 * and when the user moves Eleven into the background.

 */

@SuppressLint("NewApi")

public class MusicPlaybackService extends Service {
@@ -1710,7 +1710,7 @@ public class MusicPlaybackService extends Service { 


    /**

     * Reloads the queue as the user left it the last time they stopped using

     * Apollo

     * Eleven

     */

    private void reloadQueue() {

        int id = mCardId;

src/org/lineageos/eleven/adapters/AlbumAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import org.lineageos.eleven.cache.ImageFetcher; 
import org.lineageos.eleven.model.Album;

import org.lineageos.eleven.ui.MusicHolder;

import org.lineageos.eleven.ui.MusicHolder.DataHolder;

import org.lineageos.eleven.utils.ApolloUtils;

import org.lineageos.eleven.utils.ElevenUtils;

import org.lineageos.eleven.widgets.IPopupMenuCallback;



import java.util.Collections;
@@ -80,7 +80,7 @@ public class AlbumAdapter extends BaseAdapter implements IPopupMenuCallback { 
        // Get the layout Id

        mLayoutId = layoutId;

        // Initialize the cache & image fetcher

        mImageFetcher = ApolloUtils.getImageFetcher(context);

        mImageFetcher = ElevenUtils.getImageFetcher(context);

        mPadding = context.getResources().getDimensionPixelSize(R.dimen.list_item_general_margin);

    }

src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import org.lineageos.eleven.R; 
import org.lineageos.eleven.cache.ICacheListener;

import org.lineageos.eleven.cache.ImageCache;

import org.lineageos.eleven.model.AlbumArtistDetails;

import org.lineageos.eleven.utils.ApolloUtils;

import org.lineageos.eleven.utils.ElevenUtils;

import org.lineageos.eleven.utils.MusicUtils;

import org.lineageos.eleven.widgets.SquareImageView;
@@ -227,7 +227,7 @@ public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter { 
                }



                mTask = new AlbumArtistLoader(this, getActivity());

                ApolloUtils.execute(false, mTask, mAudioId);

                ElevenUtils.execute(false, mTask, mAudioId);

            }



        }
@@ -238,7 +238,7 @@ public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter { 
         */

        private void loadImageAsync(AlbumArtistDetails details) {

            // load the actual image

            ApolloUtils.getImageFetcher(getActivity()).loadAlbumImage(

            ElevenUtils.getImageFetcher(getActivity()).loadAlbumImage(

                    details.mArtistName,

                    details.mAlbumName,

                    details.mAlbumId,