Skip to content

Commit 2029895

Browse files
smarcetsmarcet
committed
[smarcet]
* upgraded code to meet Google Play's target API level requirement (NOV 2019) https://developer.android.com/distribute/best-practices/develop/target-sdk.html
1 parent 7b5c72c commit 2029895

File tree

19 files changed

+55
-52
lines changed

19 files changed

+55
-52
lines changed

‎app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ android {
141141
defaultConfig {
142142
applicationId "org.openstack.android.summit"
143143
minSdkVersion 18
144-
targetSdkVersion 26
144+
targetSdkVersion 28
145145
versionCode 146
146146
versionName "2.0"
147147
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -247,15 +247,15 @@ dependencies {
247247
// https://jitpack.io/com/github/smarcet/ACProgressLite/ee69096/build.log
248248
implementation 'com.github.smarcet:ACProgressLite:ee69096'
249249
// image library
250-
implementation 'com.facebook.fresco:fresco:0.11.0'
250+
implementation 'com.facebook.fresco:fresco:2.0.0'
251251
// simulate list with a linear layout
252252
implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
253253
// page indicator
254254
implementation 'com.githang:viewpagerindicator:2.4.2@aar'
255255
// Tags
256256
implementation 'com.github.kaedea:Android-Cloud-TagView-Plus:5a49f4f'
257257
// google maps
258-
implementation 'com.google.android.gms:play-services-maps:16.1.0'
258+
implementation 'com.google.android.gms:play-services-maps:17.0.0'
259259
// to get rid of UNEXPECTED TOP-LEVEL EXCEPTION: due oo many method references: (max is 65536)
260260
// https://github.com/BoltsFramework/Bolts-Android
261261
implementation 'androidx.multidex:multidex:2.0.1'
@@ -272,7 +272,7 @@ dependencies {
272272
testImplementation 'junit:junit:4.12'
273273
// Optional -- Robolectric environment
274274
testImplementation 'org.robolectric:robolectric:4.2'
275-
testImplementation 'androidx.test:core:1.1.0'
275+
testImplementation 'androidx.test:core:1.2.0'
276276
// Optional -- Mockito framework
277277
testImplementation 'org.mockito:mockito-core:2.15.0'
278278
// Optional - Power Mock
@@ -281,22 +281,22 @@ dependencies {
281281
testImplementation "org.powermock:powermock-api-mockito:1.6.6"
282282
testImplementation "org.powermock:powermock-classloading-xstream:1.6.6"
283283

284-
testImplementation 'androidx.test.ext:junit:1.1.0'
284+
testImplementation 'androidx.test.ext:junit:1.1.1'
285285

286-
testImplementation 'androidx.test:runner:1.1.0'
286+
testImplementation 'androidx.test:runner:1.2.0'
287287

288-
testImplementation 'androidx.test:rules:1.1.0'
288+
testImplementation 'androidx.test:rules:1.2.0'
289289

290290
// Instrumented tests
291-
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
291+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
292292

293-
androidTestImplementation 'androidx.test:runner:1.1.0'
293+
androidTestImplementation 'androidx.test:runner:1.2.0'
294294

295-
androidTestImplementation 'androidx.test:rules:1.1.0'
295+
androidTestImplementation 'androidx.test:rules:1.2.0'
296296
// Optional -- Hamcrest library
297297
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
298298
// Optional -- UI testing with Espresso
299-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
299+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
300300
// Optional -- UI testing with UI Automator
301301
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
302302

@@ -318,12 +318,12 @@ dependencies {
318318
implementation 'com.facebook.stetho:stetho:1.5.0'
319319
implementation 'com.uphyca:stetho_realm:2.0.0'
320320

321-
implementation 'com.google.firebase:firebase-core:16.0.8'
322-
implementation 'com.google.firebase:firebase-messaging:17.6.0'
321+
implementation 'com.google.firebase:firebase-core:17.2.1'
322+
implementation 'com.google.firebase:firebase-messaging:20.0.1'
323323

324324
// https://github.com/square/retrofit
325325
implementation 'com.google.code.gson:gson:2.8.2'
326-
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
326+
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
327327
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
328328
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
329329
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'

‎app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,6 @@
233233
</intent-filter>
234234
</service>
235235

236-
<service android:name=".common.services.FirebaseIDService">
237-
<intent-filter>
238-
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
239-
</intent-filter>
240-
</service>
241-
242236
<receiver
243237
android:name=".common.push_notifications.PushNotificationsBroadcastReceiver"
244238
android:exported="false">

‎app/src/main/java/org/openstack/android/summit/common/player/YouTubeThumbnail.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Created by sebastian on 8/17/2016.
88
*/
99
public class YouTubeThumbnail {
10-
public static final String IMG_YOUTUBE_COM_VI = "http://img.youtube.com/vi/";
10+
public static final String IMG_YOUTUBE_COM_VI = "https://img.youtube.com/vi/";
1111

1212
private YouTubeThumbnail() {}
1313

‎app/src/main/java/org/openstack/android/summit/common/services/FirebaseIDService.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/java/org/openstack/android/summit/common/user_interface/IPersonItemView.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ public interface IPersonItemView {
1111
void setTitle(String title);
1212

1313
void setPictureUri(Uri pictureUri);
14+
15+
void setRoundWithOverlayColor(int color);
1416
}
1517

‎app/src/main/java/org/openstack/android/summit/common/user_interface/PersonItemView.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import android.net.Uri;
44
import android.view.View;
55
import android.widget.TextView;
6+
7+
import com.facebook.drawee.generic.RoundingParams;
68
import com.facebook.drawee.view.SimpleDraweeView;
79
import org.openstack.android.summit.R;
810

@@ -18,24 +20,33 @@ public PersonItemView(View view) {
1820

1921
@Override
2022
public void setName(String name) {
21-
TextView nameTextView = (TextView) view.findViewById(R.id.item_person_list_name);
23+
TextView nameTextView = view.findViewById(R.id.item_person_list_name);
2224
nameTextView.setText(name);
2325
}
2426

2527
@Override
2628
public void setTitle(String title) {
27-
TextView titleTextView = (TextView) view.findViewById(R.id.item_person_list_title);
29+
TextView titleTextView = view.findViewById(R.id.item_person_list_title);
2830
titleTextView.setText(title);
2931
}
3032

3133
@Override
3234
public void setPictureUri(Uri pictureUri) {
33-
SimpleDraweeView draweeView = (SimpleDraweeView) view.findViewById(R.id.item_person_list_pic);
35+
SimpleDraweeView draweeView = view.findViewById(R.id.item_person_list_pic);
3436
draweeView.setImageURI(pictureUri);
3537
}
3638

39+
@Override
40+
public void setRoundWithOverlayColor(int color) {
41+
SimpleDraweeView draweeView = view.findViewById(R.id.item_person_list_pic);
42+
RoundingParams roundingParams = RoundingParams.asCircle();
43+
roundingParams.setOverlayColor(color);
44+
draweeView.getHierarchy().setRoundingParams(roundingParams);
45+
46+
}
47+
3748
public void setIsModerator(boolean isModerator) {
38-
TextView moderatorIndicatorTextView = (TextView) view.findViewById(R.id.item_person_moderator_indicator);
49+
TextView moderatorIndicatorTextView = view.findViewById(R.id.item_person_moderator_indicator);
3950
moderatorIndicatorTextView.setVisibility(isModerator ? View.VISIBLE : View.GONE);
4051
}
4152
}

‎app/src/main/java/org/openstack/android/summit/modules/event_detail/user_interface/EventDetailFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,19 +275,19 @@ public void loadVideo(VideoDTO video) {
275275
@Override
276276
public void showGoingButton(boolean show) {
277277
if(buttonGoing == null) return;
278-
buttonGoing.setVisibility(show ? View.VISIBLE : view.GONE);
278+
buttonGoing.setVisibility(show ? View.VISIBLE : View.GONE);
279279
}
280280

281281
@Override
282282
public void showFavoriteButton(boolean show) {
283283
if(buttonFavorite == null) return;
284-
buttonFavorite.setVisibility(show ? View.VISIBLE : view.GONE);
284+
buttonFavorite.setVisibility(show ? View.VISIBLE : View.GONE);
285285
}
286286

287287
@Override
288288
public void showRateButton(boolean show) {
289289
if(buttonRate == null) return;
290-
buttonRate.setVisibility(show ? View.VISIBLE : view.GONE);
290+
buttonRate.setVisibility(show ? View.VISIBLE : View.GONE);
291291
}
292292

293293
@Override

‎app/src/main/java/org/openstack/android/summit/modules/event_detail/user_interface/EventDetailPresenter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ public void buildSpeakerListItem(PersonItemView personItemView, int position) {
387387
personItemView.setIsModerator(
388388
event.getModerator() != null && personListItemDTO.getId() == event.getModerator().getId()
389389
);
390-
Uri uri = Uri.parse(personListItemDTO.getPictureUrl().replace("https", "http"));
391-
personItemView.setPictureUri(uri);
390+
personItemView.setPictureUri(Uri.parse(personListItemDTO.getPictureUrl()));
391+
personItemView.setRoundWithOverlayColor(view.getResources().getColor(R.color.openStackGray3));
392392
}
393393

394394
@Override

‎app/src/main/java/org/openstack/android/summit/modules/member_profile_detail/user_interface/MemberProfileDetailPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void onCreateView(Bundle savedInstanceState) {
8484
view.setTwitter(person.getTwitter());
8585
view.setIrc(person.getIrc());
8686
Uri uri = person.getPictureUrl() != null && !person.getPictureUrl().isEmpty()
87-
? Uri.parse(person.getPictureUrl().replace("https", "http"))
87+
? Uri.parse(person.getPictureUrl())
8888
: null;
8989
view.setPictureUri(uri);
9090
view.showAddEventBriteOrderContainer(isMyProfile && !isAttendee);

‎app/src/main/java/org/openstack/android/summit/modules/search/user_interface/SearchPresenter.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@ public void buildSpeakerItem(IPersonItemView personItemView, int position) {
117117
PersonListItemDTO personListItemDTO = speakers.get(position);
118118
personItemView.setName(personListItemDTO.getName());
119119
personItemView.setTitle(personListItemDTO.getTitle());
120-
121-
Uri uri = Uri.parse(personListItemDTO.getPictureUrl().replace("https", "http"));
122-
personItemView.setPictureUri(uri);
120+
personItemView.setPictureUri(Uri.parse(personListItemDTO.getPictureUrl()));
123121
}
124122

125123
@Override

‎app/src/main/java/org/openstack/android/summit/modules/speakers_list/user_interface/SpeakerListAdapter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ public void setPictureUri(Uri pictureUri) {
164164
this.picture.setImageURI(pictureUri);
165165
}
166166

167+
@Override
168+
public void setRoundWithOverlayColor(int color) {
169+
170+
}
171+
167172
public void setIsModerator(boolean isModerator) {
168173
this.is_moderator.setVisibility(isModerator ? View.VISIBLE : View.GONE);
169174
}

‎app/src/main/java/org/openstack/android/summit/modules/speakers_list/user_interface/SpeakerListFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
6060

6161
LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
6262

63-
layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
63+
layoutManager.setOrientation(RecyclerView.VERTICAL);
6464
speakerList.setLayoutManager(layoutManager);
6565

6666
speakerListAdapter = new SpeakerListAdapter(presenter);

‎app/src/main/java/org/openstack/android/summit/modules/speakers_list/user_interface/SpeakerListPresenter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public void buildItem(SpeakerListAdapter.SpeakerItemViewHolder speakerItemView,
6666
speakerItemView.setName(personListItemDTO.getName());
6767
speakerItemView.setTitle(personListItemDTO.getTitle());
6868
speakerItemView.setIsModerator(false);
69-
Uri uri = Uri.parse(personListItemDTO.getPictureUrl().replace("https", "http"));
70-
speakerItemView.setPictureUri(uri);
69+
speakerItemView.setPictureUri(Uri.parse(personListItemDTO.getPictureUrl()));
7170
}
7271

7372
public HashMap<String, Integer> createMapIndex() {

‎app/src/main/java/org/openstack/android/summit/modules/venue_list/user_interface/VenueListPresenter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ public void buildInternalVenueItem(IVenueListItemView venueListItemView, int pos
4747
String imageUrl = venue.getImages().size() > 0 ? venue.getImages().get(0) : null;
4848

4949
if (imageUrl != null) {
50-
Uri uri = Uri.parse(imageUrl.replace("https", "http"));
51-
venueListItemView.setPictureUri(uri);
50+
venueListItemView.setPictureUri(Uri.parse(imageUrl));
5251
}
5352
}
5453

‎app/src/main/res/layout/fragment_event_detail.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
android:layout_height="wrap_content"
251251
android:orientation="vertical"
252252
android:showDividers="middle|end"
253-
android:background="#eeeeee"
253+
android:background="@color/openStackGray3"
254254
android:divider="@color/openStackLightGray"
255255
app:dividerThickness="1dp" />
256256
</LinearLayout>

‎app/src/main/res/layout/fragment_member_profile_detail.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
android:layout_height="110dp"
3232
fresco:placeholderImage="@drawable/generic_user_avatar"
3333
android:paddingRight="15dp"
34-
fresco:actualImageScaleType="centerCrop"
34+
fresco:roundWithOverlayColor="@color/openStackDarkBlue"
35+
fresco:actualImageScaleType="fitCenter"
3536
android:layout_gravity="center"
3637
/>
3738
<LinearLayout

‎app/src/main/res/layout/item_person_list.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
fresco:roundAsCircle="true"
1313
fresco:roundingBorderWidth="1dp"
1414
fresco:roundingBorderColor="@color/openStackLightGray"
15+
fresco:roundWithOverlayColor="@color/white"
1516
android:layout_width="90dp"
1617
android:layout_height="90dp"
1718
fresco:placeholderImage="@drawable/generic_user_avatar"
1819
android:paddingLeft="10dp"
1920
android:paddingRight="15dp"
20-
fresco:actualImageScaleType="centerCrop"
21+
fresco:actualImageScaleType="fitCenter"
2122
android:layout_gravity="center"
2223
/>
2324

‎app/src/main/res/layout/nav_header_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
fresco:roundingBorderColor="@color/openStackLightGray"
2424
android:layout_width="70dp"
2525
android:layout_height="70dp"
26+
fresco:roundWithOverlayColor="@color/openStackDarkBlue"
2627
fresco:placeholderImage="@drawable/generic_user_avatar"
27-
fresco:actualImageScaleType="centerCrop"
28+
fresco:actualImageScaleType="fitCenter"
2829
android:layout_gravity="center"
2930
/>
3031
<LinearLayout

‎app/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<color name="openStackLightGray">#E5E5E5</color>
1010
<color name="openStackGray">#8A8A8A</color>
1111
<color name="openStackGray2">#dddddd</color>
12+
<color name="openStackGray3">#eeeeee</color>
1213
<color name="openStackSecondText">#9B9B9B</color>
1314
<color name="openStackDarkGray">#4A4A4A</color>
1415
<color name="openStackOrange">#F5A623</color>

0 commit comments

Comments
 (0)