diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c8ae5be..dd00227 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:theme="@android:style/Theme.Holo.Light.DarkActionBar" > diff --git a/app/src/main/java/com/nutomic/ensichat/MainActivity.java b/app/src/main/java/com/nutomic/ensichat/MainActivity.java deleted file mode 100644 index 01345b6..0000000 --- a/app/src/main/java/com/nutomic/ensichat/MainActivity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.nutomic.ensichat; - -import android.app.Activity; -import android.app.ActionBar; -import android.app.Fragment; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.os.Build; - - - -public class MainActivity extends Activity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - if (savedInstanceState == null) { - getFragmentManager().beginTransaction() - .add(R.id.container, new PlaceholderFragment()) - .commit(); - } - } - - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - if (id == R.id.action_settings) { - return true; - } - return super.onOptionsItemSelected(item); - } - - /** - * A placeholder fragment containing a simple view. - */ - public static class PlaceholderFragment extends Fragment { - - public PlaceholderFragment() { - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_main, container, false); - return rootView; - } - } -} diff --git a/app/src/main/java/com/nutomic/ensichat/activities/MainActivity.java b/app/src/main/java/com/nutomic/ensichat/activities/MainActivity.java new file mode 100644 index 0000000..750b72f --- /dev/null +++ b/app/src/main/java/com/nutomic/ensichat/activities/MainActivity.java @@ -0,0 +1,17 @@ +package com.nutomic.ensichat.activities; + +import android.app.Activity; +import android.os.Bundle; + +import com.nutomic.ensichat.R; + + +public class MainActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } + +} diff --git a/app/src/main/java/com/nutomic/ensichat/fragments/ContactsFragment.java b/app/src/main/java/com/nutomic/ensichat/fragments/ContactsFragment.java new file mode 100644 index 0000000..d1dad48 --- /dev/null +++ b/app/src/main/java/com/nutomic/ensichat/fragments/ContactsFragment.java @@ -0,0 +1,19 @@ +package com.nutomic.ensichat.fragments; + +import android.app.ListFragment; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.nutomic.ensichat.R; + +public class ContactsFragment extends ListFragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_main, container, false); + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e41da7b..0158f04 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,11 @@ - + + + + + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index b3f79b5..9de2c56 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -1,12 +1,18 @@ + android:layout_height="match_parent" > + + + android:layout_height="wrap_content" + android:text="@string/no_contacts_found" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" /> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml deleted file mode 100644 index 9bfd22c..0000000 --- a/app/src/main/res/menu/main.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d542306..f4a5327 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,12 @@ + + EnsiChat - Hello world! - Settings + + + + No contacts found :(