mbarrben

1. Check out develop and make pull from origin
    git checkout develop
    git pull
2. Check out your branch
    git checkout <your-branch-name-here>
3. Merge develop into your branch
    git merge develop
4. git reset --soft origin/develop
5. Commit the pending changes in a single commit
    git commit -m "<your-commit-message-here>"

mbarrben

# Retrofit, OkHttp, Gson
-keepattributes *Annotation*
-keepattributes Signature
-keep class com.squareup.okhttp.** { *; }
-keep interface com.squareup.okhttp.** { *; }
-dontwarn com.squareup.okhttp.**
-dontwarn rx.**
-dontwarn retrofit.**
-keep class retrofit.** { *; }
-keepclasseswithmembers class * {

mbarrben

/**Transforms an input object into an output object */
public interface Mapper<OUT, IN> {
    OUT map(IN in);
}

mbarrben

#To delete all branches that are already merged into the currently checked out branch:
git branch --merged | grep -v "\*" | xargs -n 1 git branch -d

mbarrben

public interface MediaSelector {
    Intent getIntentChooser();

    Uri getMediaUriFromActivityResult(int requestCode, Intent data);
}

mbarrben

iOS Emoji

by Eric Fredricksen 2012 (source code) 
This'll only work on Safari. 
[dense] [descriptive]
People
😄   😄   SMILING FACE WITH OPEN MOUTH AND SMILING EYES
😃   😃   SMILING FACE WITH OPEN MOUTH
😀   😀   GRINNING FACE
😊   😊   SMILING FACE WITH SMILING EYES

mbarrben

MessageDigest digest = MessageDigest.getInstance("SHA");
digest.update(password.getBytes());
SecretKeySpec key = new SecretKeySpec(digest.digest(), 0, 16, "AES");
Cipher c = Cipher.getInstance("AES");
c.init(Cipher.DECRYPT_MODE, key);
cis = new CipherInputStream(stream, c);
reader = new BufferedReader(new InputStreamReader(cis));
String data = reader.readLine();
array = new JSONArray(data);
reader.close();

mbarrben

git pull # to marge changes from others
git tag -d v0.99 # delete the tag
git push origin :refs/tags/v0.99 # this remove tag from remote repository
git tag v0.99 # this mark the most recent commit
git push origin v0.99 # push a new tag position to remote repository

mbarrben

---------------------------------------------------------
|               |       en       |      es-rES     |  ...
---------------------------------------------------------
|  hello_world  |  Hello world!  |  ¡Hola, mundo!  |  ...
---------------------------------------------------------
|   good_bye    |    Good bye    |      Adiós      |  ...
        .                .                .
        .                .                .
        .                .                .

mbarrben

------------------------------------------------
|         |  lang_code_1  |  lang_code_2  |  ...
------------------------------------------------
|  key_1  |  translation  |  translation  |  ...
------------------------------------------------
|  key_2  |  translation  |  translation  |  ...
     .            .               .
     .            .               .
     .            .               .