Merge pull request #137 from brarcher/ui-fixes

UI fixes and tests

Author: brarcher

app/build.gradle

@@ -56,20 +56,24 @@ dependencies {
     implementation 'com.nononsenseapps:filepicker:4.2.1'
     implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.18'
     implementation group: 'org.javatuples', name: 'javatuples', version: '1.2'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
 
     implementation 'ch.acra:acra:4.11'
 
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:3.8"
+    testImplementation "org.mockito:mockito-core:2.8.9"
+    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
+    testImplementation "org.powermock:powermock-module-junit4-rule:1.7.4"
+    testImplementation "org.powermock:powermock-classloading-xstream:1.7.4"
 }
 
 task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
 
     description 'Run findbugs'
     group 'verification'
 
-    classes = fileTree('build/intermediates/classes/debug/')
+    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
     source = fileTree('src/main/java')
     classpath = files()
 

app/src/main/java/protect/videotranscoder/activity/MainActivity.java

@@ -97,12 +97,12 @@ public class MainActivity extends AppCompatActivity
 
     private static final int SELECT_FILE_REQUEST = 2;
 
-    final List<Integer> BASIC_SETTINGS_IDS = Collections.unmodifiableList(Arrays.asList(
+    public static final List<Integer> BASIC_SETTINGS_IDS = Collections.unmodifiableList(Arrays.asList(
             R.id.basicSettingsText,
             R.id.basicSettingsTopDivider,
             R.id.containerTypeContainer,
             R.id.containerTypeContainerDivider));
-    final List<Integer> VIDEO_SETTINGS_IDS = Collections.unmodifiableList(Arrays.asList(
+    public static final List<Integer> VIDEO_SETTINGS_IDS = Collections.unmodifiableList(Arrays.asList(
             R.id.videoSettingsText,
             R.id.videoSettingsTextTopDivider,
             R.id.videoCodecContainer,
@@ -115,7 +115,7 @@ public class MainActivity extends AppCompatActivity
             R.id.resolutionContainerDivider,
             R.id.videoBitrateContainer,
             R.id.videoBitrateContainerDivider));
-    final List<Integer> AUDIO_SETTINGS_IDS = Collections.unmodifiableList(Arrays.asList(
+    public static final List<Integer> AUDIO_SETTINGS_IDS = Collections.unmodifiableList(Arrays.asList(
             R.id.audioSettingsText,
             R.id.audioSettingsTextTopDivider,
             R.id.audioCodecContainer,
@@ -769,7 +769,7 @@ private void startEncode()
         Integer audioBitrateK = (Integer) audioBitrateSpinner.getSelectedItem();
         Integer audioSampleRate = (Integer) audioSampleRateSpinner.getSelectedItem();
         String audioChannel = (String) audioChannelSpinner.getSelectedItem();
-        int videoBitrateK;
+        int videoBitrateK = 0;
 
         if(videoInfo == null)
         {
@@ -804,11 +804,14 @@ private void startEncode()
             }
         }
 
-
         try
         {
-            String videoBitrateKStr = videoBitrateValue.getText().toString();
-            videoBitrateK = Integer.parseInt(videoBitrateKStr);
+            // Ignore video bitrate for GIF
+            if(container != MediaContainer.GIF)
+            {
+                String videoBitrateKStr = videoBitrateValue.getText().toString();
+                videoBitrateK = Integer.parseInt(videoBitrateKStr);
+            }
         }
         catch(NumberFormatException e)
         {
@@ -1075,6 +1078,8 @@ private void populateOptionDefaults()
         endJumpBack.setVisibility(View.VISIBLE);
         endJumpForward.setVisibility(View.VISIBLE);
 
+        final String customString = getString(R.string.custom);
+
         containerSpinner.setAdapter(new ArrayAdapter<>(this, R.layout.spinner_textview, MediaContainer.values()));
         containerSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
         {
@@ -1089,6 +1094,11 @@ public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int
                     findViewById(resId).setVisibility(visibility);
                 }
 
+                if(resolutionSpinner.getSelectedItem().toString().equals(customString) == false)
+                {
+                    findViewById(R.id.resolutionCustomContainer).setVisibility(View.GONE);
+                }
+
                 visibility = container.supportedAudioCodecs.size() > 0 ? View.VISIBLE : View.GONE;
 
                 for(int resId : AUDIO_SETTINGS_IDS)
@@ -1160,8 +1170,6 @@ public void onNothingSelected(AdapterView<?> parent)
             }
         }
 
-        final String customString = getString(R.string.custom);
-
         LinkedList<String> fps = new LinkedList<>(Arrays.asList("15", "24", "23.98", "25", "29.97", "30", "50"));
         if(videoInfo.videoFramerate != null && fps.contains(videoInfo.videoFramerate) == false)
         {

app/src/main/res/values/dimenscalc.xml

@@ -1019,6 +1019,7 @@
     <dimen name="sp11">9sp</dimen>
     <dimen name="sp12">10sp</dimen>
     <dimen name="sp13">11sp</dimen>
+    <dimen name="sp13.5">11.5sp</dimen>
     <dimen name="sp14">12sp</dimen>
     <dimen name="sp15">13sp</dimen>
     <dimen name="sp16">14sp</dimen>