Added Transform feature

WycliffeAssociates · Jun 14, 2019 · ac8727c · ac8727c
1 parent c6efd10
commit ac8727c
Show file tree

Hide file tree

Showing 18 changed files with 539 additions and 78 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: "com.android.application"
 
-ext.trc_version = "0.2.10"
+ext.trc_version = "0.3.5"
 
 configurations.all {
     resolutionStrategy.dependencySubstitution {
@@ -10,13 +10,13 @@ configurations.all {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         applicationId "org.wycliffeassociates.trconverter"
         minSdkVersion 19
-        targetSdkVersion 22
-        versionCode 17
-        versionName "1.4.3"
+        targetSdkVersion 28
+        versionCode 18
+        versionName "1.5.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
@@ -45,12 +45,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    buildToolsVersion "26.0.2"
+    buildToolsVersion "28.0.0"
 }
 
 dependencies {
     implementation "com.android.support.constraint:constraint-layout:1.1.3"
-    implementation "com.android.support:support-v4:26.0.2"
+    implementation "com.android.support:support-v4:28.0.0"
     implementation "com.github.WycliffeAssociates:tR_Converter:$trc_version"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
     androidTestImplementation "com.android.support.test:runner:1.0.1"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,11 +10,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:windowSoftInputMode="adjustResize"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
+                <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

diff --git a/app/src/main/java/org/wycliffeassociates/converter/AnalyserTask.java b/app/src/main/java/org/wycliffeassociates/converter/AnalyserTask.java
@@ -1,7 +1,7 @@
 package org.wycliffeassociates.converter;
 
-import android.app.Fragment;
 import android.os.AsyncTask;
+import android.support.v4.app.Fragment;
 
 /**
  * Created by mXaln on 11/11/17.

diff --git a/app/src/main/java/org/wycliffeassociates/converter/ConverterFragment.java b/app/src/main/java/org/wycliffeassociates/converter/ConverterFragment.java
@@ -1,11 +1,11 @@
 package org.wycliffeassociates.converter;
 
-import android.app.Fragment;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -129,7 +129,7 @@ public Void analyzeDone() {
                 messageView.setText(R.string.set_modes);
                 messageView.setTextColor(Color.RED);
             }
-            listAdapter = new ModeListAdapter(getActivity(), modes);
+            listAdapter = new ModeListAdapter((MainActivity) getActivity(), modes);
             listView.setAdapter(listAdapter);
         }
         return null;
@@ -199,7 +199,7 @@ public Void conversionDone(final Integer result) {
     protected void init() {
         if(!modes.isEmpty()) {
             buttonText = getString(R.string.convert);
-            listAdapter = new ModeListAdapter(getActivity(), modes);
+            listAdapter = new ModeListAdapter((MainActivity) getActivity(), modes);
             listView.setAdapter(listAdapter);
         }
 
@@ -213,7 +213,7 @@ protected void init() {
         messageView.setText(messageText);
 
         try {
-            String dir = Environment.getExternalStorageDirectory().getAbsolutePath();
+            String dir = Environment.getExternalStorageDirectory().getAbsolutePath() + "/TranslationRecorder";
             converter = new Converter(dir);
 
             button.setOnClickListener(new View.OnClickListener(){
@@ -229,4 +229,10 @@ public void onClick(View v) {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        analyze();
+    }
 }
diff --git a/app/src/main/java/org/wycliffeassociates/converter/ConverterTask.java b/app/src/main/java/org/wycliffeassociates/converter/ConverterTask.java
@@ -1,7 +1,7 @@
 package org.wycliffeassociates.converter;
 
-import android.app.Fragment;
 import android.os.AsyncTask;
+import android.support.v4.app.Fragment;
 
 /**
  * Created by mXaln on 11/11/17.

diff --git a/app/src/main/java/org/wycliffeassociates/converter/MainActivity.java b/app/src/main/java/org/wycliffeassociates/converter/MainActivity.java
@@ -1,27 +1,29 @@
 package org.wycliffeassociates.converter;
 
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 
-public class MainActivity extends Activity {
+public class MainActivity extends FragmentActivity {
 
-    private ConverterFragment converterFragment;
+    private Fragment fragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        FragmentManager fm = getFragmentManager();
+        FragmentManager fm = getSupportFragmentManager();
         FragmentTransaction ft = fm.beginTransaction();
 
-        converterFragment = (ConverterFragment) fm.findFragmentById(R.id.fragment_container);
+        fragment = fm.findFragmentById(R.id.fragment_container);
 
-        if(converterFragment == null) {
-            converterFragment = new ConverterFragment();
-            ft.add(R.id.fragment_container, converterFragment).commit();
+        if(fragment == null) {
+            fragment = new ConverterFragment();
+            ft.replace(R.id.fragment_container, fragment);
+            ft.commit();
         }
     }
 }
diff --git a/app/src/main/java/org/wycliffeassociates/converter/ModeListAdapter.java b/app/src/main/java/org/wycliffeassociates/converter/ModeListAdapter.java
@@ -1,16 +1,14 @@
 package org.wycliffeassociates.converter;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
+import android.widget.*;
 
 import org.wycliffeassociates.trConverter.Mode;
 
@@ -19,10 +17,12 @@
 public class ModeListAdapter extends BaseAdapter {
     List<Mode> modes;
     LayoutInflater layoutInflater;
+    FragmentManager fragmentManager;
 
-    public ModeListAdapter(Activity activity, List<Mode> modes) {
+    public ModeListAdapter(MainActivity activity, List<Mode> modes) {
         this.modes = modes;
         layoutInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        fragmentManager = activity.getSupportFragmentManager();
     }
 
     @Override
@@ -60,6 +60,7 @@ private static class ViewHolder {
         RadioGroup radioGroup;
         RadioButton verseButton;
         RadioButton chunkButton;
+        Button editButton;
 
         Boolean isEmpty = null;
     }
@@ -77,6 +78,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             viewHolder.radioGroup = convertView.findViewById(R.id.radioGroup);
             viewHolder.verseButton = convertView.findViewById(R.id.verseRadio);
             viewHolder.chunkButton = convertView.findViewById(R.id.chunkRadio);
+            viewHolder.editButton = convertView.findViewById(R.id.editProject);
 
             convertView.setTag(viewHolder);
         } else {
@@ -87,16 +89,29 @@ public View getView(int position, View convertView, ViewGroup parent) {
             viewHolder.isEmpty = isEmpty;
         }
 
-        viewHolder.projectText.setText(item.projectName);
+        viewHolder.projectText.setText(item.toString());
         if (!viewHolder.isEmpty) {
             viewHolder.projectText.setTextColor(Color.GRAY);
+
+            viewHolder.editButton.setOnClickListener(new View.OnClickListener(){
+                public void onClick(View v) {
+                    FragmentTransaction ft = fragmentManager.beginTransaction();
+                    ft.replace(R.id.fragment_container,
+                            TransformerFragment.newInstance(item.toString(), item.language, item.version, item.book));
+                    ft.setTransition(FragmentTransaction.TRANSIT_ENTER_MASK);
+                    ft.addToBackStack(null);
+                    ft.commit();
+                }
+
+            });
         } else {
             viewHolder.projectText.setTextColor(isEmpty ? Color.RED : Color.BLACK);
             viewHolder.projectText.setTypeface(null, Typeface.BOLD);
             viewHolder.verseButton.setTextColor(isEmpty ? Color.RED : Color.BLACK);
             viewHolder.verseButton.setTypeface(null, Typeface.BOLD);
             viewHolder.chunkButton.setTextColor(isEmpty ? Color.RED : Color.BLACK);
             viewHolder.chunkButton.setTypeface(null, Typeface.BOLD);
+            viewHolder.editButton.setEnabled(false);
         }
 
         viewHolder.verseButton.setChecked(item.mode.equals("verse"));