fix: some major fixes, and doc changes

Fixed an issue happening with widget that caused the app to crash on some devices. Removed proguard because apparently its stopping some devices from building and I actually have no idea what it was doing in the first place. Moved some hard coded strings to the strings file in res. Added some stuff to the TODO folder (such as moving some of the widget video play code to the widget class instead of the videosyncintentservice)
itsnotafake · Apr 6, 2017 · 456a651 · 456a651
1 parent 6958753
commit 456a651
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Atakr/app/build.gradle b/Atakr/app/build.gradle
@@ -25,7 +25,6 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             debuggable true
             signingConfig signingConfigs.udacity
         }

diff --git a/Atakr/app/src/main/java/templar/atakr/framework/ShareActivity.java b/Atakr/app/src/main/java/templar/atakr/framework/ShareActivity.java
@@ -107,7 +107,7 @@ protected void onCreate(Bundle savedInstanceState){
                 //Title and View have edited text rather than the raw values,
                 //so we create the editted strings and then place them in their
                 //respective text views
-                String viewString = mYoutubeViews + " Views";
+                String viewString = mYoutubeViews + " " + getResources().getString(R.string.share_cardview_views);
 
                 shareYoutubeTitle.setText(mYoutubeTitle);
                 shareYoutubeUploader.setText(mYoutubeUploader);
@@ -147,8 +147,7 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
                     startActivityForResult(
                             AuthUI.getInstance()
                                     .createSignInIntentBuilder()
-                                    .setProviders(Arrays.asList(new AuthUI.IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build(),
-                                            new AuthUI.IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build()))
+                                    .setProviders(Arrays.asList(new AuthUI.IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build()))
                                     .setTheme(R.style.AppTheme)
                                     .setIsSmartLockEnabled(false)
                                     .build(),
@@ -183,13 +182,13 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                     mVideoDatabaseReference.child(mYoutubeId).setValue(video);
                     Toast.makeText(
                             getApplicationContext(),
-                            "Video Posted!",
+                            R.string.share_posted,
                             Toast.LENGTH_SHORT
                     ).show();
                 }else{
                     Toast.makeText(
                             getApplicationContext(),
-                            "This video has already been uploaded",
+                            R.string.share_already_uploaded,
                             Toast.LENGTH_SHORT
                     ).show();
                 }

diff --git a/Atakr/app/src/main/java/templar/atakr/sync/VideoSyncIntentService.java b/Atakr/app/src/main/java/templar/atakr/sync/VideoSyncIntentService.java
@@ -263,6 +263,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                     if(counter == randomInt){
                         Video video = videoSnapshot.getValue(Video.class);
                         Intent videoPlay = new Intent(mContext, VideoPlayActivity.class);
+                        videoPlay.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         videoPlay.putExtra(VideoPlayActivity.YOUTUBE_VIDEO_ID, video.getYoutubeVideoId());
                         mContext.startActivity(videoPlay);
                     }

diff --git a/Atakr/app/src/main/res/values/strings.xml b/Atakr/app/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
     <string name="share_atakrTitle">(optional) New Title</string>
     <string name="share_atakrGame">(optional) Game</string>
     <string name="share_button">Post</string>
+    <string name="share_posted">Video Posted!</string>
+    <string name="share_already_uploaded">This video has already been uploaded</string>
 
     <!--VIDEO BROWSE FRAGMENT -->
     <string name="video_list_image_CD">Youtube Thumbnail</string>

diff --git a/TODO.txt b/TODO.txt
@@ -11,6 +11,7 @@ Atakr TODO (Long Term):
 -make client side master app for more highly tuned popularity numbers
 -better configure the widget
 -fix problem where app crashes when you try to scroll down immediately after refreshing
+-move getting random video from service to widget class
 
 
 IMMEDIATE TODO (FOR APP LAUNCH):