Major update; fixed orientation/fragment issues with International activity

Author: Fortyseven

MainApp/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bytestemplar.tonedef"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    package="com.bytestemplar.tonedef"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -16,19 +17,22 @@
         android:label="@string/app_name"
         android:windowSoftInputMode="stateHidden">
         <activity
-            android:name="com.bytestemplar.tonedef.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.bytestemplar.tonedef.DTMFActivity"/>
-        <activity android:name="com.bytestemplar.tonedef.ConfigActivity"/>
-        <activity android:name="com.bytestemplar.tonedef.RedBoxActivity"/>
-        <activity android:name="com.bytestemplar.tonedef.BlueBoxActivity"/>
-        <activity android:name="com.bytestemplar.tonedef.AboutActivity"/>
-        <activity android:name="com.bytestemplar.tonedef.international.InternationalActivity"/>
+        <activity android:name=".DTMFActivity"/>
+        <activity android:name=".ConfigActivity"/>
+        <activity android:name=".RedBoxActivity"/>
+        <activity android:name=".BlueBoxActivity"/>
+        <activity android:name=".AboutActivity"/>
+        <activity android:name=".international.InternationalActivity"/>
+        <activity android:name=".international.ButtonActivity">
+        </activity>
     </application>
-</manifest>
+
+</manifest>

MainApp/src/main/java/com/bytestemplar/tonedef/MainActivity.java

@@ -23,6 +23,7 @@
 import android.preference.PreferenceManager;
 import android.view.View;
 
+import com.bytestemplar.tonedef.international.CountryTonesRepository;
 import com.bytestemplar.tonedef.international.InternationalActivity;
 import com.bytestemplar.tonedef.utils.UICustom;
 
@@ -39,6 +40,7 @@ protected void onCreate( Bundle savedInstanceState )
 
         UICustom.init( this );
         UICustom.getInstance().updateActivity( this );
+        CountryTonesRepository.getInstance( this );
 
         showWhatsNew();
     }

MainApp/src/main/java/com/bytestemplar/tonedef/international/ButtonActivity.java

@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * ________                 ____       ____
+ * _/_  __/___  ____  ___  / __ \___  / __/
+ * __/ / / __ \/ __ \/ _ \/ / / / _ \/ /_
+ * _/ / / /_/ / / / /  __/ /_/ /  __/ __/
+ * /_/  \____/_/ /_/\___/_____/\___/_/
+ *
+ * Copyright (c) 2015 Bytes Templar
+ * http://BytesTemplar.com/
+ *
+ * Refer to the license.txt file included for license information.
+ * If it is missing, contact [email protected] for details.
+ ******************************************************************************/
+
+package com.bytestemplar.tonedef.international;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+
+public class ButtonActivity extends FragmentActivity
+{
+    @Override
+    protected void onCreate( Bundle savedInstanceState )
+    {
+        super.onCreate( savedInstanceState );
+
+        // single-pane
+        if ( savedInstanceState == null ) {
+            ButtonsFragment buttons_fragment = new ButtonsFragment();
+
+            buttons_fragment.setArguments( getIntent().getExtras() );
+
+            getSupportFragmentManager().beginTransaction()
+                                       .replace( android.R.id.content, buttons_fragment, InternationalActivity.BUTTON_TAG )
+                                       .commit();
+        }
+        else {
+            // TODO: Need to revisit this; kicks us back to country list on orientation change
+            finish();
+        }
+    }
+
+    @Override
+    protected void onRestoreInstanceState( Bundle savedInstanceState )
+    {
+        super.onRestoreInstanceState( savedInstanceState );
+    }
+}

MainApp/src/main/java/com/bytestemplar/tonedef/international/ButtonsFragment.java

@@ -28,23 +28,21 @@
 
 import com.bytestemplar.tonedef.R;
 import com.bytestemplar.tonedef.gen.ToneSequence;
+import com.bytestemplar.tonedef.utils.UICustom;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 public class ButtonsFragment extends Fragment
 {
     public static final String ARG_POSITION = "position";
 
-    private int                   _current_position;
-    private InternationalActivity _parent;
+    private int _current_position;
 
     @Nullable
     @Override
     public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState )
     {
-        _parent = (InternationalActivity) getActivity();
         return inflater.inflate( R.layout.frag_buttons, container, false );
     }
 
@@ -54,7 +52,7 @@ public void onViewCreated( View view, @Nullable Bundle savedInstanceState )
         super.onViewCreated( view, savedInstanceState );
 
         TextView tv_name = (TextView) getView().findViewById( R.id.tv_countryname );
-        tv_name.setTypeface( _parent.getCustomTypeface() );
+        tv_name.setTypeface( UICustom.getInstance().getTypeface() );
 
         int position = -1;
 
@@ -70,7 +68,6 @@ public void onViewCreated( View view, @Nullable Bundle savedInstanceState )
         }
 
         if ( position >= 0 ) {
-
             updateButtons( position );
         }
 
@@ -84,34 +81,30 @@ public void updateButtons( int position )
         if ( ll_btn_container != null ) {
 
             _current_position = position;
+            CountryTones current_tones = CountryTonesRepository.getInstance().getCountryAtPosition( position );
 
             ll_btn_container.removeAllViewsInLayout();
 
-            CountryTones ct = _parent.getCountryAtPosition( position );
-
             // Update label
             TextView tv_name = (TextView) getView().findViewById( R.id.tv_countryname );
-            tv_name.setText( ct.getName() );
-            tv_name.setTypeface( _parent.getCustomTypeface() );
-            if ( ct.getFlagDrawable() > 0 ) {
-                tv_name.setCompoundDrawablesWithIntrinsicBounds( ct.getFlagDrawable(), 0, 0, 0 );
+            tv_name.setText( current_tones.getName() );
+            tv_name.setTypeface( UICustom.getInstance().getTypeface() );
+            if ( current_tones.getFlagDrawable() > 0 ) {
+                tv_name.setCompoundDrawablesWithIntrinsicBounds( current_tones.getFlagDrawable(), 0, 0, 0 );
             }
 
             // Generate buttons
+            HashMap<String, ToneSequence> sequences = current_tones.getSequences();
 
-            HashMap<String, ToneSequence> sequences = ct.getSequences();
-
-            Iterator i = sequences.entrySet().iterator();
-
-            while ( i.hasNext() ) {
-                Map.Entry pair = (Map.Entry) i.next();
+            for ( Object o : sequences.entrySet() ) {
+                Map.Entry pair = (Map.Entry) o;
 
                 String sequence_name = (String) pair.getKey();
                 final ToneSequence sequence = (ToneSequence) pair.getValue();
 
                 Button btn = new Button( ll_btn_container.getContext() );
                 btn.setText( sequence_name );
-                btn.setTypeface( _parent.getCustomTypeface() );
+                btn.setTypeface( UICustom.getInstance().getTypeface() );
                 btn.setBackgroundResource( R.drawable.touchpadbutton );
                 btn.setTextColor( Color.WHITE );
                 btn.setOnTouchListener( new View.OnTouchListener()
@@ -139,6 +132,7 @@ public boolean onTouch( View v, MotionEvent event )
         }
     }
 
+    @Override
     public void onSaveInstanceState( Bundle out_state )
     {
         super.onSaveInstanceState( out_state );

MainApp/src/main/java/com/bytestemplar/tonedef/international/CountryListAdapter.java

@@ -21,18 +21,17 @@
 import android.widget.TextView;
 
 import com.bytestemplar.tonedef.R;
+import com.bytestemplar.tonedef.utils.UICustom;
 
 import java.util.ArrayList;
 
 public class CountryListAdapter extends BaseAdapter
 {
-    private final InternationalActivity   _parent;
-    private       ArrayList<CountryTones> _countries;
+    private ArrayList<CountryTones> _countries;
 
-    public CountryListAdapter( ArrayList<CountryTones> countries, InternationalActivity parent )
+    public CountryListAdapter( ArrayList<CountryTones> countries )
     {
         _countries = countries;
-        _parent = parent;
     }
 
     @Override
@@ -76,7 +75,7 @@ public View getView( int position, View convertView, ViewGroup parent )
             //tv_name.setCompoundDrawablesWithIntrinsicBounds( parent.getContext().getResources().getDrawable( flag_drawable ), null, null, null );
             tv_name.setCompoundDrawablesWithIntrinsicBounds( flag_drawable, 0, 0, 0 );
         }
-        tv_name.setTypeface( _parent.getCustomTypeface() );
+        tv_name.setTypeface( UICustom.getInstance().getTypeface() );
         return convertView;
     }
 }

MainApp/src/main/java/com/bytestemplar/tonedef/international/CountryListFragment.java

@@ -25,7 +25,7 @@ public class CountryListFragment extends ListFragment
 {
     public interface OnCountrySelectedListener
     {
-        public void onCountrySelected( int position );
+        void onCountrySelected( int position );
     }
 
     OnCountrySelectedListener mCallback;
@@ -34,9 +34,9 @@ public interface OnCountrySelectedListener
     public void onCreate( Bundle savedInstanceState )
     {
         super.onCreate( savedInstanceState );
-        setRetainInstance( true );
+        //setRetainInstance( true );
 
-        CountryListAdapter foo = ( (InternationalActivity) ( getActivity() ) ).getCountryListAdapter();
+        CountryListAdapter foo = CountryTonesRepository.getInstance().getCountryListAdapter();
 
         setListAdapter( foo );
     }
@@ -66,4 +66,11 @@ public void onListItemClick( ListView l, View v, int position, long id )
         mCallback.onCountrySelected( position );
         getListView().setItemChecked( position, true );
     }
+
+    @Override
+    public void onSaveInstanceState( Bundle out_state )
+    {
+        super.onSaveInstanceState( out_state );
+    }
+
 }