Skip to content

Commit

Permalink
Merge branch 'release/v8.1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@analaragomes
analaragomes committed Dec 28, 2016
2 parents 3ca5434 + 625e28b commit 32ac325
Show file tree
Hide file tree
Showing 32 changed files with 380 additions and 442 deletions.
39 changes: 36 additions & 3 deletions aptoide_accountmanager/src/main/res/layout/activity_create_store.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
android:background="#c16114"
android:gravity="center"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="23dp"
android:paddingEnd="23dp"
android:text="@string/create_store_header"
android:textColor="@color/white"
/>
Expand Down Expand Up @@ -69,6 +71,7 @@
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="20dp"
android:src="@drawable/create_store_avatar"
/>
Expand All @@ -78,10 +81,13 @@
android:layout_height="33.3dp"
android:layout_alignBottom="@+id/create_store_image"
android:layout_alignRight="@+id/create_store_image"
android:layout_alignEnd="@+id/create_store_image"
android:background="@drawable/create_user_camera_background_shape"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingStart="8dp"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:src="@drawable/create_user_camera"
/>
Expand All @@ -99,7 +105,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="57dp"
android:layout_marginStart="57dp"
android:layout_marginRight="55dp"
android:layout_marginEnd="55dp"
android:layout_marginTop="49dp"
android:gravity="center_vertical"
android:maxLines="2"
Expand All @@ -113,8 +121,10 @@
android:id="@+id/create_store_random_photo"
android:layout_width="98dp"
android:layout_height="12dp"
android:layout_marginLeft="56.3dp"
android:layout_marginRight="62.3dp"
android:layout_marginLeft="56dp"
android:layout_marginStart="56dp"
android:layout_marginRight="62dp"
android:layout_marginEnd="62dp"
android:layout_marginTop="21dp"
android:text="@string/create_user_random_photo"
android:textColor="#a9a9a9"
Expand All @@ -135,7 +145,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16.3dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="29.3dp"
android:orientation="vertical"
>
Expand All @@ -154,12 +165,14 @@
android:layout_width="match_parent"
android:layout_height="43dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="15dp"
android:background="@color/create_store_edit_text_background"
android:hint="@string/create_store_name_inserted"
android:maxLength="63"
android:padding="8dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:textSize="12sp"
/>

Expand Down Expand Up @@ -199,6 +212,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -214,6 +228,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_orange"
android:layout_alignRight="@+id/create_store_theme_orange"
android:layout_alignEnd="@+id/create_store_theme_orange"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -225,6 +240,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -240,6 +256,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_green"
android:layout_alignRight="@+id/create_store_theme_green"
android:layout_alignEnd="@+id/create_store_theme_green"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -251,6 +268,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -266,6 +284,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_red"
android:layout_alignRight="@+id/create_store_theme_red"
android:layout_alignEnd="@+id/create_store_theme_red"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -277,6 +296,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -292,6 +312,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_indigo"
android:layout_alignRight="@+id/create_store_theme_indigo"
android:layout_alignEnd="@+id/create_store_theme_indigo"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -303,6 +324,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -318,6 +340,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_teal"
android:layout_alignRight="@+id/create_store_theme_teal"
android:layout_alignEnd="@+id/create_store_theme_teal"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -329,6 +352,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -344,6 +368,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_pink"
android:layout_alignRight="@+id/create_store_theme_pink"
android:layout_alignEnd="@+id/create_store_theme_pink"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -355,6 +380,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -370,6 +396,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_lime"
android:layout_alignRight="@+id/create_store_theme_lime"
android:layout_alignEnd="@+id/create_store_theme_lime"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -381,6 +408,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -396,6 +424,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_amber"
android:layout_alignRight="@+id/create_store_theme_amber"
android:layout_alignEnd="@+id/create_store_theme_amber"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -407,6 +436,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -422,6 +452,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_brown"
android:layout_alignRight="@+id/create_store_theme_brown"
android:layout_alignEnd="@+id/create_store_theme_brown"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand All @@ -432,6 +463,7 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="26dp"
>

<ImageView
Expand All @@ -447,6 +479,7 @@
android:layout_height="23dp"
android:layout_alignBottom="@+id/create_store_theme_lightblue"
android:layout_alignRight="@+id/create_store_theme_lightblue"
android:layout_alignEnd="@+id/create_store_theme_lightblue"
android:scaleType="centerInside"
android:src="@drawable/create_store_theme_check"
android:visibility="invisible"
Expand Down
19 changes: 17 additions & 2 deletions aptoide_accountmanager/src/main/res/layout/activity_create_user.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
android:background="#c16114"
android:gravity="center_vertical"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="23dp"
android:paddingEnd="23dp"
android:text="@string/create_user_header"
android:textColor="@color/white"
/>
Expand All @@ -60,6 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/create_user_header_textview"
android:orientation="horizontal"
>
Expand All @@ -75,6 +78,7 @@
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="20dp"
app:srcCompat="@drawable/create_user_avatar"
/>
Expand All @@ -84,10 +88,13 @@
android:layout_height="33.3dp"
android:layout_alignBottom="@+id/create_user_image"
android:layout_alignRight="@+id/create_user_image"
android:layout_alignEnd="@+id/create_user_image"
android:background="@drawable/create_user_camera_background_shape"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingStart="8dp"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:src="@drawable/create_user_camera"
/>
Expand All @@ -105,7 +112,9 @@
android:layout_width="96dp"
android:layout_height="33dp"
android:layout_marginLeft="57dp"
android:layout_marginStart="57dp"
android:layout_marginRight="63dp"
android:layout_marginEnd="63dp"
android:layout_marginTop="48.7dp"
android:gravity="center_vertical"
android:text="@string/create_user_take_picture"
Expand All @@ -118,8 +127,10 @@
android:id="@+id/create_user_random_photo"
android:layout_width="98dp"
android:layout_height="12dp"
android:layout_marginLeft="56.3dp"
android:layout_marginRight="62.3dp"
android:layout_marginLeft="56dp"
android:layout_marginStart="56dp"
android:layout_marginRight="62dp"
android:layout_marginEnd="62dp"
android:layout_marginTop="21dp"
android:text="@string/create_user_random_photo"
android:textColor="#a9a9a9"
Expand All @@ -136,6 +147,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/create_user_images"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="36.3dp"
android:orientation="vertical"
>
Expand All @@ -154,12 +166,14 @@
android:layout_width="match_parent"
android:layout_height="43dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="8.7dp"
android:background="@color/create_store_edit_text_background"
android:hint="@string/create_user_username"
android:maxLength="63"
android:padding="8dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:textColor="@color/black"
android:textSize="12sp"
/>
Expand Down Expand Up @@ -197,6 +211,7 @@
android:layout_width="152dp"
android:layout_height="46dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:text="@string/create_user_create_button"
style="?attr/customButton"
/>
Expand Down
1 change: 1 addition & 0 deletions aptoide_accountmanager/src/main/res/layout/credentials_edit_texts.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
android:id="@+id/btn_show_hide_pass"
android:layout_width="30dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="17dp"
Expand Down
1 change: 1 addition & 0 deletions crashreports/src/main/java/cm/aptoide/pt/crashreports/CrashReports.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class CrashReports {

private final static String TAG = CrashReports.class.getSimpleName(); //TAG for the logger

private static boolean initialized = false;
private static CrashLogger crashLogger;

Expand Down
2 changes: 1 addition & 1 deletion dataprovider/src/main/java/cm/aptoide/pt/dataprovider/repository/IdsRepositoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private String generateAdvertisingId() {
return advertisingId;
}

public String getAndroidId() {
public synchronized String getAndroidId() {
String androidId = sharedPreferences.getString(ANDROID_ID_CLIENT, null);

if (androidId == null) {
Expand Down
9 changes: 8 additions & 1 deletion dataprovider/src/main/java/cm/aptoide/pt/dataprovider/ws/v2/aptwords/GetAdsRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package cm.aptoide.pt.dataprovider.ws.v2.aptwords;

import android.text.TextUtils;
import cm.aptoide.pt.dataprovider.util.DataproviderUtils;
import cm.aptoide.pt.dataprovider.util.referrer.ReferrerUtils;
import cm.aptoide.pt.dataprovider.ws.Api;
Expand All @@ -13,6 +14,7 @@
import cm.aptoide.pt.networkclient.okhttp.UserAgentGenerator;
import cm.aptoide.pt.networkclient.okhttp.UserAgentInterceptor;
import cm.aptoide.pt.networkclient.util.HashMapNotNull;
import cm.aptoide.pt.preferences.managed.ManagerPreferences;
import cm.aptoide.pt.preferences.secure.SecurePreferences;
import cm.aptoide.pt.utils.AptoideUtils;
import java.util.List;
Expand Down Expand Up @@ -150,7 +152,12 @@ public static GetAdsRequest ofSecondTry(String packageName, String aptoideClient
parameters.put("partners", "1-3,5-10");
parameters.put("keywords", keyword);
parameters.put("oem_id", oemid);

if (ManagerPreferences.isDebug()) {
String forceCountry = ManagerPreferences.getForceCountry();
if (!TextUtils.isEmpty(forceCountry)) {
parameters.put("country", forceCountry);
}
}
if (googlePlayServicesAvailable) {
parameters.put("flag", "gms");
}
Expand Down
Loading

0 comments on commit 32ac325

Please sign in to comment.