diff --git a/.gitignore b/.gitignore index a95ae19..7bc2fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,10 @@ DEADJOE .#* *.jar *.zip +*.aab *.apk +*.jks +*.keystore bin/ gen/ bin/* @@ -18,3 +21,13 @@ build.xml assets/build.properties .settings/ .settings/* +*.iml +.gradle +/local.properties +/.idea +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/AndroidManifest.xml b/AndroidManifest.xml deleted file mode 100644 index be1e3a5..0000000 --- a/AndroidManifest.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..7f364bb --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,38 @@ +plugins { + alias(libs.plugins.android.application) +} + +android { + namespace 'de.onyxbits.textfiction' + compileSdk 35 + + defaultConfig { + applicationId "de.onyxbits.textfiction" + minSdk 24 + targetSdk 33 + versionCode 12 + versionName "3.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } +} + +dependencies { + + implementation libs.appcompat + implementation libs.material + testImplementation libs.junit + androidTestImplementation libs.ext.junit + androidTestImplementation libs.espresso.core +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..b45cf76 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/de/onyxbits/textfiction/AppRater.java b/app/src/main/java/de/onyxbits/textfiction/AppRater.java similarity index 100% rename from src/de/onyxbits/textfiction/AppRater.java rename to app/src/main/java/de/onyxbits/textfiction/AppRater.java diff --git a/src/de/onyxbits/textfiction/FileUtil.java b/app/src/main/java/de/onyxbits/textfiction/FileUtil.java similarity index 78% rename from src/de/onyxbits/textfiction/FileUtil.java rename to app/src/main/java/de/onyxbits/textfiction/FileUtil.java index 3996083..6242d3b 100644 --- a/src/de/onyxbits/textfiction/FileUtil.java +++ b/app/src/main/java/de/onyxbits/textfiction/FileUtil.java @@ -10,7 +10,11 @@ import java.util.Arrays; import java.util.Comparator; +import android.content.ContentResolver; +import android.database.Cursor; +import android.net.Uri; import android.os.Environment; +import android.provider.OpenableColumns; public class FileUtil implements Comparator { @@ -43,7 +47,8 @@ public class FileUtil implements Comparator { * Just make sure we got all of our directories. */ static { - File root = Environment.getExternalStorageDirectory(); + // File root = Environment.getExternalStorageDirectory(); + File root = MainActivity.appContext().getExternalFilesDir(null); library = new File(new File(root, HOMEDIR), GAMEDIR); saves = new File(new File(root, HOMEDIR), SAVEDIR); data = new File(new File(root, HOMEDIR), DATADIR); @@ -115,11 +120,32 @@ public FileUtil() { * @throws IOException * if something goes wrong */ - public static void importGame(File src) throws IOException { + public static void importGame(Uri src) throws IOException { ensureDirs(); - File dst = new File(library, src.getName()); + FileInputStream fin; + File dst; + if (src != null && src.getScheme().equals(ContentResolver.SCHEME_FILE)) { + File from = new File(src.getPath()); + dst = new File(library, from.getName()); + fin = new FileInputStream(from); + } else if(src != null && src.getScheme().equals(ContentResolver.SCHEME_CONTENT)) { + Cursor uCursor = MainActivity.appContext().getContentResolver().query(src, null, null, null, null); + String fName = ""; + if (uCursor != null && uCursor.moveToFirst()) { + int nameIndex = uCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME); + int sizeIndex = uCursor.getColumnIndex(OpenableColumns.SIZE); + fName = uCursor.getString(nameIndex); + } + assert uCursor != null; + uCursor.close(); + dst = new File(library, fName); + fin = new FileInputStream(MainActivity.appContext().getContentResolver().openFileDescriptor(src, "r").getFileDescriptor()); + } + else { + return; + } byte[] buf = new byte[1024]; - FileInputStream fin = new FileInputStream(src); + //FileInputStream fin = new FileInputStream(from); FileOutputStream fout = new FileOutputStream(dst); int len; diff --git a/src/de/onyxbits/textfiction/GameActivity.java b/app/src/main/java/de/onyxbits/textfiction/GameActivity.java similarity index 89% rename from src/de/onyxbits/textfiction/GameActivity.java rename to app/src/main/java/de/onyxbits/textfiction/GameActivity.java index 09dfda7..1eae3f0 100644 --- a/src/de/onyxbits/textfiction/GameActivity.java +++ b/app/src/main/java/de/onyxbits/textfiction/GameActivity.java @@ -40,9 +40,9 @@ import android.widget.ViewFlipper; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.OnInitListener; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.NavUtils; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.core.app.NavUtils; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.AlertDialog; @@ -72,6 +72,7 @@ public class GameActivity extends FragmentActivity implements DialogInterface.On * of the game via this extra. */ public static final String LOADFILE = "loadfile"; + // public static final String FILENAME = "filename"; /** * How many items to keep in the messagebuffer at most. Note: this should be @@ -127,6 +128,7 @@ public class GameActivity extends FragmentActivity implements DialogInterface.On /** * The game playing in this activity */ + // private Uri storyFile; private File storyFile; /** @@ -308,62 +310,52 @@ public boolean onPrepareOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.mi_flip_view: { - flipView(windowFlipper.getCurrentView() != storyBoard); - return true; - } - case R.id.mi_save: { - pendingAction = PENDING_SAVE; - saveName = new EditText(this); - saveName.setSingleLine(true); - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.title_save_game).setPositiveButton(android.R.string.ok, this) - .setView(saveName).show(); - return true; - } - case R.id.mi_restore: { - String[] sg = FileUtil.listSaveName(storyFile); - if (sg.length > 0) { - pendingAction = PENDING_RESTORE; - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.title_restore_game).setItems(sg, this).show(); - } - else { - Toast.makeText(this, R.string.msg_no_savegames, Toast.LENGTH_SHORT).show(); - } - return true; - } - - case R.id.mi_clear_log: { - retainerFragment.messageBuffer.clear(); - messages.notifyDataSetChanged(); - return true; - } - case R.id.mi_help: { - MainActivity.openUri(this, Uri.parse(getString(R.string.url_help))); - return true; - } - case R.id.mi_restart: { - pendingAction = PENDING_RESTART; - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.title_please_confirm).setMessage(R.string.msg_really_restart) - .setPositiveButton(android.R.string.yes, this) - .setNegativeButton(android.R.string.no, this).show(); - return true; - } - - case android.R.id.home: - // This ID represents the Home or Up button. In the case of this - // activity, the Up button is shown. Use NavUtils to allow users - // to navigate up one level in the application structure. For - // more details, see the Navigation pattern on Android Design: - // - // http://developer.android.com/design/patterns/navigation.html#up-vs-back - // - NavUtils.navigateUpFromSameTask(this); - return true; - } + int itemId = item.getItemId(); + if (itemId == R.id.mi_flip_view) { + flipView(windowFlipper.getCurrentView() != storyBoard); + return true; + } else if (itemId == R.id.mi_save) { + pendingAction = PENDING_SAVE; + saveName = new EditText(this); + saveName.setSingleLine(true); + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.title_save_game).setPositiveButton(android.R.string.ok, this) + .setView(saveName).show(); + return true; + } else if (itemId == R.id.mi_restore) { + String[] sg = FileUtil.listSaveName(storyFile); + if (sg.length > 0) { + pendingAction = PENDING_RESTORE; + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.title_restore_game).setItems(sg, this).show(); + } else { + Toast.makeText(this, R.string.msg_no_savegames, Toast.LENGTH_SHORT).show(); + } + return true; + } else if (itemId == R.id.mi_clear_log) { + retainerFragment.messageBuffer.clear(); + messages.notifyDataSetChanged(); + return true; + } else if (itemId == R.id.mi_help) { + MainActivity.openUri(this, Uri.parse(getString(R.string.url_help))); + return true; + } else if (itemId == R.id.mi_restart) { + pendingAction = PENDING_RESTART; + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.title_please_confirm).setMessage(R.string.msg_really_restart) + .setPositiveButton(android.R.string.yes, this) + .setNegativeButton(android.R.string.no, this).show(); + return true; + } else if (itemId == android.R.id.home) {// This ID represents the Home or Up button. In the case of this + // activity, the Up button is shown. Use NavUtils to allow users + // to navigate up one level in the application structure. For + // more details, see the Navigation pattern on Android Design: + // + // http://developer.android.com/design/patterns/navigation.html#up-vs-back + // + NavUtils.navigateUpFromSameTask(this); + return true; + } return super.onOptionsItemSelected(item); } @@ -539,9 +531,9 @@ private void flipView(boolean showstory) { if (showstory) { if (now != storyBoard) { - windowFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.animator.slide_in_right)); + windowFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_right)); windowFlipper - .setOutAnimation(AnimationUtils.loadAnimation(this, R.animator.slide_out_left)); + .setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_out_left)); windowFlipper.showPrevious(); } } diff --git a/src/de/onyxbits/textfiction/ImportTask.java b/app/src/main/java/de/onyxbits/textfiction/ImportTask.java similarity index 86% rename from src/de/onyxbits/textfiction/ImportTask.java rename to app/src/main/java/de/onyxbits/textfiction/ImportTask.java index de4f994..aff833b 100644 --- a/src/de/onyxbits/textfiction/ImportTask.java +++ b/app/src/main/java/de/onyxbits/textfiction/ImportTask.java @@ -1,16 +1,23 @@ package de.onyxbits.textfiction; import java.io.File; +import java.io.FileDescriptor; import java.io.FilenameFilter; import java.util.Arrays; +import android.Manifest; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; import android.os.AsyncTask; -import android.os.Environment; +//import android.os.Environment; import android.util.Log; import android.widget.Toast; +import android.app.Activity; + +import static androidx.core.app.ActivityCompat.startActivityForResult; /** * Helper task for the LibraryFragment that takes care of copying games from the @@ -28,7 +35,7 @@ class ImportTask extends AsyncTask implements /** * The import candidates from which the user may choose. */ - private File[] toImport; + protected Uri[] toImport; /** * Flags the files in "toImport" that are to be downloaded @@ -45,7 +52,7 @@ class ImportTask extends AsyncTask implements */ private LibraryFragment master; - private ImportTask() { + ImportTask() { } @Override @@ -113,7 +120,8 @@ public void onClick(DialogInterface dialog, int which) { * @param files * files to import */ - public static void importGames(LibraryFragment master, File[] files) { + + public static void importGames(LibraryFragment master, Uri[] files) { ImportTask task = new ImportTask(); task.master = master; task.toImport = files; @@ -122,19 +130,8 @@ public static void importGames(LibraryFragment master, File[] files) { task.execute(new Object()); } - /** - * Shows a list of games that are available in the public downloads directory, - * allowing the user to select which ones to import. - * - * @param master - * the fragment to report back to in case something was imported. - */ - public static void showSelectDialog(LibraryFragment master) { - - ImportTask task = new ImportTask(); - task.toImport = Environment.getExternalStoragePublicDirectory( - Environment.DIRECTORY_DOWNLOADS).listFiles(task); +/* if (task.toImport == null || task.toImport.length == 0) { Toast.makeText(master.getActivity(), R.string.msg_nothing_to_import, Toast.LENGTH_SHORT).show(); @@ -156,6 +153,7 @@ public static void showSelectDialog(LibraryFragment master) { .setMultiChoiceItems(names, null, task) .setPositiveButton(android.R.string.ok, task).create().show(); } +*/ @Override public boolean accept(File dir, String filename) { diff --git a/src/de/onyxbits/textfiction/LibraryAdapter.java b/app/src/main/java/de/onyxbits/textfiction/LibraryAdapter.java similarity index 100% rename from src/de/onyxbits/textfiction/LibraryAdapter.java rename to app/src/main/java/de/onyxbits/textfiction/LibraryAdapter.java diff --git a/src/de/onyxbits/textfiction/LibraryFragment.java b/app/src/main/java/de/onyxbits/textfiction/LibraryFragment.java similarity index 53% rename from src/de/onyxbits/textfiction/LibraryFragment.java rename to app/src/main/java/de/onyxbits/textfiction/LibraryFragment.java index fc803f5..02f4ff2 100644 --- a/src/de/onyxbits/textfiction/LibraryFragment.java +++ b/app/src/main/java/de/onyxbits/textfiction/LibraryFragment.java @@ -2,12 +2,18 @@ import java.io.File; import java.util.ArrayList; +import java.util.List; +import de.onyxbits.textfiction.ImportTask; import android.app.Activity; import android.content.Intent; +import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; + +import android.provider.DocumentsContract; +import android.provider.OpenableColumns; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -38,6 +44,8 @@ public class LibraryFragment extends Fragment implements private ArrayList games; + private ImportTask task = new ImportTask(); + /** * Mandatory empty constructor for the fragment manager to instantiate the * fragment (e.g. upon screen orientation changes). @@ -71,22 +79,66 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.library_fragment, menu); } - + private static final int PICK_TI_FILE=42; + @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.mi_browse: { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, - Uri.parse(getString(R.string.url_catalog))); - startActivity(browserIntent); - return true; - } - case R.id.mi_import: { - ImportTask.showSelectDialog(this); - return true; + int itemId = item.getItemId(); + if (itemId == R.id.mi_browse) { + Intent browserIntent = new Intent(Intent.ACTION_VIEW, + Uri.parse(getString(R.string.url_catalog))); + startActivity(browserIntent); + return true; + } else if (itemId == R.id.mi_import) { + Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); + //Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + //intent.setTypeAndNormalize("file/*.z5"); + //intent.setTypeAndNormalize("application/octet-stream"); + // application/x-zmachine + intent.setType("*/*"); + intent.addCategory(Intent.CATEGORY_OPENABLE); + // FIXME: How are these returned!? + //intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); + //startActivityForResult(Intent.createChooser(intent, "Select File"), REQUEST_FILE_PICKER); + + this.startActivityForResult(intent, PICK_TI_FILE); + // task = new ImportTask(); + // task.showSelectDialog(this); + return true; + } + return false; + } + + @Override + public void onActivityResult(int requestCode, int resultCode, + Intent resultData) { + if (requestCode == PICK_TI_FILE + && resultCode == Activity.RESULT_OK) { + // The result data contains a URI for the document or directory that + // the user selected. + Uri uri = null; + List chosen = new ArrayList(); + if (resultData != null) { + uri = resultData.getData(); +/* + String mimeType = getActivity().getContentResolver().getType(uri); + Cursor uCursor = getActivity().getContentResolver().query(uri, null, null, null, null); + String fName = ""; + if (uCursor != null && uCursor.moveToFirst()) { + int nameIndex = uCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME); + int sizeIndex = uCursor.getColumnIndex(OpenableColumns.SIZE); + fName = uCursor.getString(nameIndex); + } +*/ + chosen.add(uri); + //Intent intent = new Intent(getActivity(), GameActivity.class); + // intent.putExtra(GameActivity.LOADFILE, fName); + // intent.putExtra(GameActivity.FILEURI, uri); + // intent.putExtra(GameActivity.FILENAME, fName); + // startActivity(intent); } + ImportTask.importGames(this, chosen.toArray(new Uri[0])); } - return false; } @Override diff --git a/src/de/onyxbits/textfiction/LoaderTask.java b/app/src/main/java/de/onyxbits/textfiction/LoaderTask.java similarity index 100% rename from src/de/onyxbits/textfiction/LoaderTask.java rename to app/src/main/java/de/onyxbits/textfiction/LoaderTask.java diff --git a/src/de/onyxbits/textfiction/MainActivity.java b/app/src/main/java/de/onyxbits/textfiction/MainActivity.java similarity index 73% rename from src/de/onyxbits/textfiction/MainActivity.java rename to app/src/main/java/de/onyxbits/textfiction/MainActivity.java index c7a6be1..3102716 100644 --- a/src/de/onyxbits/textfiction/MainActivity.java +++ b/app/src/main/java/de/onyxbits/textfiction/MainActivity.java @@ -3,6 +3,8 @@ import java.io.File; import java.lang.reflect.Field; +import android.Manifest; +import android.app.Application; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Context; @@ -11,7 +13,8 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; +import androidx.core.app.ActivityCompat; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -24,10 +27,14 @@ * @author patrick * */ + public class MainActivity extends FragmentActivity { + private static Context context; + private int EXTERNAL_STORAGE_PERMISSION_CODE = 23; @Override protected void onCreate(Bundle savedInstanceState) { + context = this; SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(this); try { @@ -42,33 +49,38 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); AppRater.appLaunched(this); Uri game = getIntent().getData(); - if (game != null && game.getScheme().equals(ContentResolver.SCHEME_FILE)) { + if (game != null) { + //&& } game.getScheme().equals(ContentResolver.SCHEME_FILE)) { LibraryFragment frag = (LibraryFragment) getSupportFragmentManager() .findFragmentById(R.id.fragment_library); - File[] f = { new File(game.getPath()) }; + //File[] f = { new File(game.getPath()) }; + Uri[] f = { game }; ImportTask.importGames(frag, f); } } + public static Context appContext() + { + return(context); + } @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) { - switch (item.getItemId()) { - case R.id.mi_help: { - openUri(this,Uri.parse(getString(R.string.url_help))); - return true; - } - case R.id.mi_settings: { - startActivity(new Intent(this, SettingActivity.class)); - return true; - } - } + int itemId = item.getItemId(); + if (itemId == R.id.mi_help) { + openUri(this, Uri.parse(getString(R.string.url_help))); + return true; + } else if (itemId == R.id.mi_settings) { + startActivity(new Intent(this, SettingActivity.class)); + return true; + } return false; } diff --git a/src/de/onyxbits/textfiction/RetainerFragment.java b/app/src/main/java/de/onyxbits/textfiction/RetainerFragment.java similarity index 97% rename from src/de/onyxbits/textfiction/RetainerFragment.java rename to app/src/main/java/de/onyxbits/textfiction/RetainerFragment.java index 7cba300..da71975 100644 --- a/src/de/onyxbits/textfiction/RetainerFragment.java +++ b/app/src/main/java/de/onyxbits/textfiction/RetainerFragment.java @@ -8,7 +8,7 @@ import de.onyxbits.textfiction.zengine.ZMachine; import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; /** * Initializing a game is expensive and loosing gamestate on rotation would diff --git a/src/de/onyxbits/textfiction/SettingActivity.java b/app/src/main/java/de/onyxbits/textfiction/SettingActivity.java similarity index 97% rename from src/de/onyxbits/textfiction/SettingActivity.java rename to app/src/main/java/de/onyxbits/textfiction/SettingActivity.java index 0d063b2..626adb7 100644 --- a/src/de/onyxbits/textfiction/SettingActivity.java +++ b/app/src/main/java/de/onyxbits/textfiction/SettingActivity.java @@ -7,8 +7,8 @@ import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceActivity; import android.preference.PreferenceManager; -import android.support.v4.app.NavUtils; -import android.support.v4.app.TaskStackBuilder; +import androidx.core.app.NavUtils; +import androidx.core.app.TaskStackBuilder; import android.annotation.TargetApi; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/src/de/onyxbits/textfiction/StoryAdapter.java b/app/src/main/java/de/onyxbits/textfiction/StoryAdapter.java similarity index 100% rename from src/de/onyxbits/textfiction/StoryAdapter.java rename to app/src/main/java/de/onyxbits/textfiction/StoryAdapter.java diff --git a/src/de/onyxbits/textfiction/StoryItem.java b/app/src/main/java/de/onyxbits/textfiction/StoryItem.java similarity index 100% rename from src/de/onyxbits/textfiction/StoryItem.java rename to app/src/main/java/de/onyxbits/textfiction/StoryItem.java diff --git a/src/de/onyxbits/textfiction/input/CharInputConnection.java b/app/src/main/java/de/onyxbits/textfiction/input/CharInputConnection.java similarity index 100% rename from src/de/onyxbits/textfiction/input/CharInputConnection.java rename to app/src/main/java/de/onyxbits/textfiction/input/CharInputConnection.java diff --git a/src/de/onyxbits/textfiction/input/CmdIcon.java b/app/src/main/java/de/onyxbits/textfiction/input/CmdIcon.java similarity index 100% rename from src/de/onyxbits/textfiction/input/CmdIcon.java rename to app/src/main/java/de/onyxbits/textfiction/input/CmdIcon.java diff --git a/src/de/onyxbits/textfiction/input/CommandChanger.java b/app/src/main/java/de/onyxbits/textfiction/input/CommandChanger.java similarity index 100% rename from src/de/onyxbits/textfiction/input/CommandChanger.java rename to app/src/main/java/de/onyxbits/textfiction/input/CommandChanger.java diff --git a/src/de/onyxbits/textfiction/input/CompassFragment.java b/app/src/main/java/de/onyxbits/textfiction/input/CompassFragment.java similarity index 99% rename from src/de/onyxbits/textfiction/input/CompassFragment.java rename to app/src/main/java/de/onyxbits/textfiction/input/CompassFragment.java index 7b5ad5c..b2743f8 100644 --- a/src/de/onyxbits/textfiction/input/CompassFragment.java +++ b/app/src/main/java/de/onyxbits/textfiction/input/CompassFragment.java @@ -15,7 +15,7 @@ import android.content.DialogInterface; import android.media.AudioManager; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/src/de/onyxbits/textfiction/input/IconAdapter.java b/app/src/main/java/de/onyxbits/textfiction/input/IconAdapter.java similarity index 100% rename from src/de/onyxbits/textfiction/input/IconAdapter.java rename to app/src/main/java/de/onyxbits/textfiction/input/IconAdapter.java diff --git a/src/de/onyxbits/textfiction/input/InputFragment.java b/app/src/main/java/de/onyxbits/textfiction/input/InputFragment.java similarity index 98% rename from src/de/onyxbits/textfiction/input/InputFragment.java rename to app/src/main/java/de/onyxbits/textfiction/input/InputFragment.java index d63f59c..bfe1a3b 100644 --- a/src/de/onyxbits/textfiction/input/InputFragment.java +++ b/app/src/main/java/de/onyxbits/textfiction/input/InputFragment.java @@ -9,7 +9,7 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -121,9 +121,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Log.w(getClass().getName(), e); } flipper.setInAnimation(AnimationUtils.loadAnimation(ctx, - R.animator.slide_in_right)); + R.anim.slide_in_right)); flipper.setOutAnimation(AnimationUtils.loadAnimation(ctx, - R.animator.slide_out_left)); + R.anim.slide_out_left)); return flipper; } diff --git a/src/de/onyxbits/textfiction/input/InputProcessor.java b/app/src/main/java/de/onyxbits/textfiction/input/InputProcessor.java similarity index 100% rename from src/de/onyxbits/textfiction/input/InputProcessor.java rename to app/src/main/java/de/onyxbits/textfiction/input/InputProcessor.java diff --git a/src/de/onyxbits/textfiction/input/KeyboardButton.java b/app/src/main/java/de/onyxbits/textfiction/input/KeyboardButton.java similarity index 100% rename from src/de/onyxbits/textfiction/input/KeyboardButton.java rename to app/src/main/java/de/onyxbits/textfiction/input/KeyboardButton.java diff --git a/src/de/onyxbits/textfiction/input/WordExtractor.java b/app/src/main/java/de/onyxbits/textfiction/input/WordExtractor.java similarity index 98% rename from src/de/onyxbits/textfiction/input/WordExtractor.java rename to app/src/main/java/de/onyxbits/textfiction/input/WordExtractor.java index 523cbd4..cb1017b 100644 --- a/src/de/onyxbits/textfiction/input/WordExtractor.java +++ b/app/src/main/java/de/onyxbits/textfiction/input/WordExtractor.java @@ -3,7 +3,7 @@ import android.content.Context; import android.media.AudioManager; -import android.support.v4.view.GestureDetectorCompat; +import androidx.core.view.GestureDetectorCompat; import android.view.GestureDetector.OnDoubleTapListener; import android.view.GestureDetector.OnGestureListener; import android.view.MotionEvent; diff --git a/src/de/onyxbits/textfiction/input/package.html b/app/src/main/java/de/onyxbits/textfiction/input/package.html similarity index 100% rename from src/de/onyxbits/textfiction/input/package.html rename to app/src/main/java/de/onyxbits/textfiction/input/package.html diff --git a/src/de/onyxbits/textfiction/zengine/GrueException.java b/app/src/main/java/de/onyxbits/textfiction/zengine/GrueException.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/GrueException.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/GrueException.java diff --git a/src/de/onyxbits/textfiction/zengine/IFFChunkInfo.java b/app/src/main/java/de/onyxbits/textfiction/zengine/IFFChunkInfo.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/IFFChunkInfo.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/IFFChunkInfo.java diff --git a/src/de/onyxbits/textfiction/zengine/IFFChunkNotFoundException.java b/app/src/main/java/de/onyxbits/textfiction/zengine/IFFChunkNotFoundException.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/IFFChunkNotFoundException.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/IFFChunkNotFoundException.java diff --git a/src/de/onyxbits/textfiction/zengine/IFFFile.java b/app/src/main/java/de/onyxbits/textfiction/zengine/IFFFile.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/IFFFile.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/IFFFile.java diff --git a/src/de/onyxbits/textfiction/zengine/IFFInputFile.java b/app/src/main/java/de/onyxbits/textfiction/zengine/IFFInputFile.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/IFFInputFile.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/IFFInputFile.java diff --git a/src/de/onyxbits/textfiction/zengine/IFFOutputFile.java b/app/src/main/java/de/onyxbits/textfiction/zengine/IFFOutputFile.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/IFFOutputFile.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/IFFOutputFile.java diff --git a/src/de/onyxbits/textfiction/zengine/NoSuchKeyException.java b/app/src/main/java/de/onyxbits/textfiction/zengine/NoSuchKeyException.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/NoSuchKeyException.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/NoSuchKeyException.java diff --git a/src/de/onyxbits/textfiction/zengine/StyleRegion.java b/app/src/main/java/de/onyxbits/textfiction/zengine/StyleRegion.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/StyleRegion.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/StyleRegion.java diff --git a/src/de/onyxbits/textfiction/zengine/ZColor.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZColor.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZColor.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZColor.java diff --git a/src/de/onyxbits/textfiction/zengine/ZDictionary.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZDictionary.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZDictionary.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZDictionary.java diff --git a/src/de/onyxbits/textfiction/zengine/ZDictionary3.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZDictionary3.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZDictionary3.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZDictionary3.java diff --git a/src/de/onyxbits/textfiction/zengine/ZDictionary5.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZDictionary5.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZDictionary5.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZDictionary5.java diff --git a/src/de/onyxbits/textfiction/zengine/ZFrameBound.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZFrameBound.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZFrameBound.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZFrameBound.java diff --git a/src/de/onyxbits/textfiction/zengine/ZHeader.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZHeader.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZHeader.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZHeader.java diff --git a/src/de/onyxbits/textfiction/zengine/ZHeader3.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZHeader3.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZHeader3.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZHeader3.java diff --git a/src/de/onyxbits/textfiction/zengine/ZHeader5.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZHeader5.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZHeader5.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZHeader5.java diff --git a/src/de/onyxbits/textfiction/zengine/ZInstruction.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZInstruction.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZInstruction.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZInstruction.java diff --git a/src/de/onyxbits/textfiction/zengine/ZInstruction5.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZInstruction5.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZInstruction5.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZInstruction5.java diff --git a/src/de/onyxbits/textfiction/zengine/ZMachine.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZMachine.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine.java diff --git a/src/de/onyxbits/textfiction/zengine/ZMachine3.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine3.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZMachine3.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine3.java diff --git a/src/de/onyxbits/textfiction/zengine/ZMachine5.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine5.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZMachine5.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine5.java diff --git a/src/de/onyxbits/textfiction/zengine/ZMachine8.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine8.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZMachine8.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZMachine8.java diff --git a/src/de/onyxbits/textfiction/zengine/ZObjectTree.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZObjectTree.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZObjectTree.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZObjectTree.java diff --git a/src/de/onyxbits/textfiction/zengine/ZObjectTree3.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZObjectTree3.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZObjectTree3.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZObjectTree3.java diff --git a/src/de/onyxbits/textfiction/zengine/ZObjectTree5.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZObjectTree5.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZObjectTree5.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZObjectTree5.java diff --git a/src/de/onyxbits/textfiction/zengine/ZScreen.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZScreen.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZScreen.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZScreen.java diff --git a/src/de/onyxbits/textfiction/zengine/ZState.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZState.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZState.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZState.java diff --git a/src/de/onyxbits/textfiction/zengine/ZStateHeader.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZStateHeader.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZStateHeader.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZStateHeader.java diff --git a/src/de/onyxbits/textfiction/zengine/ZStatus.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZStatus.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZStatus.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZStatus.java diff --git a/src/de/onyxbits/textfiction/zengine/ZWindow.java b/app/src/main/java/de/onyxbits/textfiction/zengine/ZWindow.java similarity index 100% rename from src/de/onyxbits/textfiction/zengine/ZWindow.java rename to app/src/main/java/de/onyxbits/textfiction/zengine/ZWindow.java diff --git a/res/animator/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml similarity index 100% rename from res/animator/slide_in_right.xml rename to app/src/main/res/anim/slide_in_right.xml diff --git a/res/animator/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml similarity index 100% rename from res/animator/slide_out_left.xml rename to app/src/main/res/anim/slide_out_left.xml diff --git a/res/drawable-hdpi/clark_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-hdpi/clark_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/clark_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-hdpi/clark_textfield_activated_holo_light.9.png diff --git a/res/drawable-hdpi/clark_textfield_default_holo_light.9.png b/app/src/main/res/drawable-hdpi/clark_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/clark_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-hdpi/clark_textfield_default_holo_light.9.png diff --git a/res/drawable-hdpi/clark_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/clark_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/clark_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/clark_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-hdpi/clark_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-hdpi/clark_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/clark_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-hdpi/clark_textfield_disabled_holo_light.9.png diff --git a/res/drawable-hdpi/clark_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/clark_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/clark_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/clark_textfield_focused_holo_light.9.png diff --git a/res/drawable-hdpi/dinah_prompt_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-hdpi/dinah_prompt_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/dinah_prompt_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-hdpi/dinah_prompt_textfield_activated_holo_light.9.png diff --git a/res/drawable-hdpi/dinah_prompt_textfield_default_holo_light.9.png b/app/src/main/res/drawable-hdpi/dinah_prompt_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/dinah_prompt_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-hdpi/dinah_prompt_textfield_default_holo_light.9.png diff --git a/res/drawable-hdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-hdpi/dinah_prompt_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-hdpi/dinah_prompt_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/dinah_prompt_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-hdpi/dinah_prompt_textfield_disabled_holo_light.9.png diff --git a/res/drawable-hdpi/dinah_prompt_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/dinah_prompt_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/dinah_prompt_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/dinah_prompt_textfield_focused_holo_light.9.png diff --git a/res/drawable-hdpi/ic_action_browse.png b/app/src/main/res/drawable-hdpi/ic_action_browse.png similarity index 100% rename from res/drawable-hdpi/ic_action_browse.png rename to app/src/main/res/drawable-hdpi/ic_action_browse.png diff --git a/res/drawable-hdpi/ic_action_clearlog.png b/app/src/main/res/drawable-hdpi/ic_action_clearlog.png similarity index 100% rename from res/drawable-hdpi/ic_action_clearlog.png rename to app/src/main/res/drawable-hdpi/ic_action_clearlog.png diff --git a/res/drawable-hdpi/ic_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_delete.png similarity index 100% rename from res/drawable-hdpi/ic_action_delete.png rename to app/src/main/res/drawable-hdpi/ic_action_delete.png diff --git a/res/drawable-hdpi/ic_action_down.png b/app/src/main/res/drawable-hdpi/ic_action_down.png similarity index 100% rename from res/drawable-hdpi/ic_action_down.png rename to app/src/main/res/drawable-hdpi/ic_action_down.png diff --git a/res/drawable-hdpi/ic_action_expand.png b/app/src/main/res/drawable-hdpi/ic_action_expand.png similarity index 100% rename from res/drawable-hdpi/ic_action_expand.png rename to app/src/main/res/drawable-hdpi/ic_action_expand.png diff --git a/res/drawable-hdpi/ic_action_flip.png b/app/src/main/res/drawable-hdpi/ic_action_flip.png similarity index 100% rename from res/drawable-hdpi/ic_action_flip.png rename to app/src/main/res/drawable-hdpi/ic_action_flip.png diff --git a/res/drawable-hdpi/ic_action_forward.png b/app/src/main/res/drawable-hdpi/ic_action_forward.png similarity index 100% rename from res/drawable-hdpi/ic_action_forward.png rename to app/src/main/res/drawable-hdpi/ic_action_forward.png diff --git a/res/drawable-hdpi/ic_action_fullscreen.png b/app/src/main/res/drawable-hdpi/ic_action_fullscreen.png similarity index 100% rename from res/drawable-hdpi/ic_action_fullscreen.png rename to app/src/main/res/drawable-hdpi/ic_action_fullscreen.png diff --git a/res/drawable-hdpi/ic_action_help.png b/app/src/main/res/drawable-hdpi/ic_action_help.png similarity index 100% rename from res/drawable-hdpi/ic_action_help.png rename to app/src/main/res/drawable-hdpi/ic_action_help.png diff --git a/res/drawable-hdpi/ic_action_import.png b/app/src/main/res/drawable-hdpi/ic_action_import.png similarity index 100% rename from res/drawable-hdpi/ic_action_import.png rename to app/src/main/res/drawable-hdpi/ic_action_import.png diff --git a/res/drawable-hdpi/ic_action_keyboard.png b/app/src/main/res/drawable-hdpi/ic_action_keyboard.png similarity index 100% rename from res/drawable-hdpi/ic_action_keyboard.png rename to app/src/main/res/drawable-hdpi/ic_action_keyboard.png diff --git a/res/drawable-hdpi/ic_action_left.png b/app/src/main/res/drawable-hdpi/ic_action_left.png similarity index 100% rename from res/drawable-hdpi/ic_action_left.png rename to app/src/main/res/drawable-hdpi/ic_action_left.png diff --git a/res/drawable-hdpi/ic_action_restart.png b/app/src/main/res/drawable-hdpi/ic_action_restart.png similarity index 100% rename from res/drawable-hdpi/ic_action_restart.png rename to app/src/main/res/drawable-hdpi/ic_action_restart.png diff --git a/res/drawable-hdpi/ic_action_restore.png b/app/src/main/res/drawable-hdpi/ic_action_restore.png similarity index 100% rename from res/drawable-hdpi/ic_action_restore.png rename to app/src/main/res/drawable-hdpi/ic_action_restore.png diff --git a/res/drawable-hdpi/ic_action_right.png b/app/src/main/res/drawable-hdpi/ic_action_right.png similarity index 100% rename from res/drawable-hdpi/ic_action_right.png rename to app/src/main/res/drawable-hdpi/ic_action_right.png diff --git a/res/drawable-hdpi/ic_action_save.png b/app/src/main/res/drawable-hdpi/ic_action_save.png similarity index 100% rename from res/drawable-hdpi/ic_action_save.png rename to app/src/main/res/drawable-hdpi/ic_action_save.png diff --git a/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png similarity index 100% rename from res/drawable-hdpi/ic_action_settings.png rename to app/src/main/res/drawable-hdpi/ic_action_settings.png diff --git a/res/drawable-hdpi/ic_action_submit.png b/app/src/main/res/drawable-hdpi/ic_action_submit.png similarity index 100% rename from res/drawable-hdpi/ic_action_submit.png rename to app/src/main/res/drawable-hdpi/ic_action_submit.png diff --git a/res/drawable-hdpi/ic_action_up.png b/app/src/main/res/drawable-hdpi/ic_action_up.png similarity index 100% rename from res/drawable-hdpi/ic_action_up.png rename to app/src/main/res/drawable-hdpi/ic_action_up.png diff --git a/res/drawable-hdpi/ic_action_user0.png b/app/src/main/res/drawable-hdpi/ic_action_user0.png similarity index 100% rename from res/drawable-hdpi/ic_action_user0.png rename to app/src/main/res/drawable-hdpi/ic_action_user0.png diff --git a/res/drawable-hdpi/ic_action_user1.png b/app/src/main/res/drawable-hdpi/ic_action_user1.png similarity index 100% rename from res/drawable-hdpi/ic_action_user1.png rename to app/src/main/res/drawable-hdpi/ic_action_user1.png diff --git a/res/drawable-hdpi/ic_action_user10.png b/app/src/main/res/drawable-hdpi/ic_action_user10.png similarity index 100% rename from res/drawable-hdpi/ic_action_user10.png rename to app/src/main/res/drawable-hdpi/ic_action_user10.png diff --git a/res/drawable-hdpi/ic_action_user11.png b/app/src/main/res/drawable-hdpi/ic_action_user11.png similarity index 100% rename from res/drawable-hdpi/ic_action_user11.png rename to app/src/main/res/drawable-hdpi/ic_action_user11.png diff --git a/res/drawable-hdpi/ic_action_user12.png b/app/src/main/res/drawable-hdpi/ic_action_user12.png similarity index 100% rename from res/drawable-hdpi/ic_action_user12.png rename to app/src/main/res/drawable-hdpi/ic_action_user12.png diff --git a/res/drawable-hdpi/ic_action_user13.png b/app/src/main/res/drawable-hdpi/ic_action_user13.png similarity index 100% rename from res/drawable-hdpi/ic_action_user13.png rename to app/src/main/res/drawable-hdpi/ic_action_user13.png diff --git a/res/drawable-hdpi/ic_action_user14.png b/app/src/main/res/drawable-hdpi/ic_action_user14.png similarity index 100% rename from res/drawable-hdpi/ic_action_user14.png rename to app/src/main/res/drawable-hdpi/ic_action_user14.png diff --git a/res/drawable-hdpi/ic_action_user15.png b/app/src/main/res/drawable-hdpi/ic_action_user15.png similarity index 100% rename from res/drawable-hdpi/ic_action_user15.png rename to app/src/main/res/drawable-hdpi/ic_action_user15.png diff --git a/res/drawable-hdpi/ic_action_user16.png b/app/src/main/res/drawable-hdpi/ic_action_user16.png similarity index 100% rename from res/drawable-hdpi/ic_action_user16.png rename to app/src/main/res/drawable-hdpi/ic_action_user16.png diff --git a/res/drawable-hdpi/ic_action_user17.png b/app/src/main/res/drawable-hdpi/ic_action_user17.png similarity index 100% rename from res/drawable-hdpi/ic_action_user17.png rename to app/src/main/res/drawable-hdpi/ic_action_user17.png diff --git a/res/drawable-hdpi/ic_action_user18.png b/app/src/main/res/drawable-hdpi/ic_action_user18.png similarity index 100% rename from res/drawable-hdpi/ic_action_user18.png rename to app/src/main/res/drawable-hdpi/ic_action_user18.png diff --git a/res/drawable-hdpi/ic_action_user19.png b/app/src/main/res/drawable-hdpi/ic_action_user19.png similarity index 100% rename from res/drawable-hdpi/ic_action_user19.png rename to app/src/main/res/drawable-hdpi/ic_action_user19.png diff --git a/res/drawable-hdpi/ic_action_user2.png b/app/src/main/res/drawable-hdpi/ic_action_user2.png similarity index 100% rename from res/drawable-hdpi/ic_action_user2.png rename to app/src/main/res/drawable-hdpi/ic_action_user2.png diff --git a/res/drawable-hdpi/ic_action_user20.png b/app/src/main/res/drawable-hdpi/ic_action_user20.png similarity index 100% rename from res/drawable-hdpi/ic_action_user20.png rename to app/src/main/res/drawable-hdpi/ic_action_user20.png diff --git a/res/drawable-hdpi/ic_action_user21.png b/app/src/main/res/drawable-hdpi/ic_action_user21.png similarity index 100% rename from res/drawable-hdpi/ic_action_user21.png rename to app/src/main/res/drawable-hdpi/ic_action_user21.png diff --git a/res/drawable-hdpi/ic_action_user22.png b/app/src/main/res/drawable-hdpi/ic_action_user22.png similarity index 100% rename from res/drawable-hdpi/ic_action_user22.png rename to app/src/main/res/drawable-hdpi/ic_action_user22.png diff --git a/res/drawable-hdpi/ic_action_user23.png b/app/src/main/res/drawable-hdpi/ic_action_user23.png similarity index 100% rename from res/drawable-hdpi/ic_action_user23.png rename to app/src/main/res/drawable-hdpi/ic_action_user23.png diff --git a/res/drawable-hdpi/ic_action_user24.png b/app/src/main/res/drawable-hdpi/ic_action_user24.png similarity index 100% rename from res/drawable-hdpi/ic_action_user24.png rename to app/src/main/res/drawable-hdpi/ic_action_user24.png diff --git a/res/drawable-hdpi/ic_action_user25.png b/app/src/main/res/drawable-hdpi/ic_action_user25.png similarity index 100% rename from res/drawable-hdpi/ic_action_user25.png rename to app/src/main/res/drawable-hdpi/ic_action_user25.png diff --git a/res/drawable-hdpi/ic_action_user26.png b/app/src/main/res/drawable-hdpi/ic_action_user26.png similarity index 100% rename from res/drawable-hdpi/ic_action_user26.png rename to app/src/main/res/drawable-hdpi/ic_action_user26.png diff --git a/res/drawable-hdpi/ic_action_user27.png b/app/src/main/res/drawable-hdpi/ic_action_user27.png similarity index 100% rename from res/drawable-hdpi/ic_action_user27.png rename to app/src/main/res/drawable-hdpi/ic_action_user27.png diff --git a/res/drawable-hdpi/ic_action_user28.png b/app/src/main/res/drawable-hdpi/ic_action_user28.png similarity index 100% rename from res/drawable-hdpi/ic_action_user28.png rename to app/src/main/res/drawable-hdpi/ic_action_user28.png diff --git a/res/drawable-hdpi/ic_action_user29.png b/app/src/main/res/drawable-hdpi/ic_action_user29.png similarity index 100% rename from res/drawable-hdpi/ic_action_user29.png rename to app/src/main/res/drawable-hdpi/ic_action_user29.png diff --git a/res/drawable-hdpi/ic_action_user3.png b/app/src/main/res/drawable-hdpi/ic_action_user3.png similarity index 100% rename from res/drawable-hdpi/ic_action_user3.png rename to app/src/main/res/drawable-hdpi/ic_action_user3.png diff --git a/res/drawable-hdpi/ic_action_user30.png b/app/src/main/res/drawable-hdpi/ic_action_user30.png similarity index 100% rename from res/drawable-hdpi/ic_action_user30.png rename to app/src/main/res/drawable-hdpi/ic_action_user30.png diff --git a/res/drawable-hdpi/ic_action_user31.png b/app/src/main/res/drawable-hdpi/ic_action_user31.png similarity index 100% rename from res/drawable-hdpi/ic_action_user31.png rename to app/src/main/res/drawable-hdpi/ic_action_user31.png diff --git a/res/drawable-hdpi/ic_action_user4.png b/app/src/main/res/drawable-hdpi/ic_action_user4.png similarity index 100% rename from res/drawable-hdpi/ic_action_user4.png rename to app/src/main/res/drawable-hdpi/ic_action_user4.png diff --git a/res/drawable-hdpi/ic_action_user5.png b/app/src/main/res/drawable-hdpi/ic_action_user5.png similarity index 100% rename from res/drawable-hdpi/ic_action_user5.png rename to app/src/main/res/drawable-hdpi/ic_action_user5.png diff --git a/res/drawable-hdpi/ic_action_user6.png b/app/src/main/res/drawable-hdpi/ic_action_user6.png similarity index 100% rename from res/drawable-hdpi/ic_action_user6.png rename to app/src/main/res/drawable-hdpi/ic_action_user6.png diff --git a/res/drawable-hdpi/ic_action_user7.png b/app/src/main/res/drawable-hdpi/ic_action_user7.png similarity index 100% rename from res/drawable-hdpi/ic_action_user7.png rename to app/src/main/res/drawable-hdpi/ic_action_user7.png diff --git a/res/drawable-hdpi/ic_action_user8.png b/app/src/main/res/drawable-hdpi/ic_action_user8.png similarity index 100% rename from res/drawable-hdpi/ic_action_user8.png rename to app/src/main/res/drawable-hdpi/ic_action_user8.png diff --git a/res/drawable-hdpi/ic_action_user9.png b/app/src/main/res/drawable-hdpi/ic_action_user9.png similarity index 100% rename from res/drawable-hdpi/ic_action_user9.png rename to app/src/main/res/drawable-hdpi/ic_action_user9.png diff --git a/res/drawable-hdpi/ic_compass_blank.png b/app/src/main/res/drawable-hdpi/ic_compass_blank.png similarity index 100% rename from res/drawable-hdpi/ic_compass_blank.png rename to app/src/main/res/drawable-hdpi/ic_compass_blank.png diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-mdpi/clark_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-mdpi/clark_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/clark_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-mdpi/clark_textfield_activated_holo_light.9.png diff --git a/res/drawable-mdpi/clark_textfield_default_holo_light.9.png b/app/src/main/res/drawable-mdpi/clark_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/clark_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-mdpi/clark_textfield_default_holo_light.9.png diff --git a/res/drawable-mdpi/clark_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/clark_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/clark_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/clark_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-mdpi/clark_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/clark_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/clark_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-mdpi/clark_textfield_disabled_holo_light.9.png diff --git a/res/drawable-mdpi/clark_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/clark_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/clark_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/clark_textfield_focused_holo_light.9.png diff --git a/res/drawable-mdpi/dinah_prompt_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-mdpi/dinah_prompt_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/dinah_prompt_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-mdpi/dinah_prompt_textfield_activated_holo_light.9.png diff --git a/res/drawable-mdpi/dinah_prompt_textfield_default_holo_light.9.png b/app/src/main/res/drawable-mdpi/dinah_prompt_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/dinah_prompt_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-mdpi/dinah_prompt_textfield_default_holo_light.9.png diff --git a/res/drawable-mdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-mdpi/dinah_prompt_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/dinah_prompt_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/dinah_prompt_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-mdpi/dinah_prompt_textfield_disabled_holo_light.9.png diff --git a/res/drawable-mdpi/dinah_prompt_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/dinah_prompt_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/dinah_prompt_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/dinah_prompt_textfield_focused_holo_light.9.png diff --git a/res/drawable-mdpi/ic_action_browse.png b/app/src/main/res/drawable-mdpi/ic_action_browse.png similarity index 100% rename from res/drawable-mdpi/ic_action_browse.png rename to app/src/main/res/drawable-mdpi/ic_action_browse.png diff --git a/res/drawable-mdpi/ic_action_clearlog.png b/app/src/main/res/drawable-mdpi/ic_action_clearlog.png similarity index 100% rename from res/drawable-mdpi/ic_action_clearlog.png rename to app/src/main/res/drawable-mdpi/ic_action_clearlog.png diff --git a/res/drawable-mdpi/ic_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_delete.png similarity index 100% rename from res/drawable-mdpi/ic_action_delete.png rename to app/src/main/res/drawable-mdpi/ic_action_delete.png diff --git a/res/drawable-mdpi/ic_action_down.png b/app/src/main/res/drawable-mdpi/ic_action_down.png similarity index 100% rename from res/drawable-mdpi/ic_action_down.png rename to app/src/main/res/drawable-mdpi/ic_action_down.png diff --git a/res/drawable-mdpi/ic_action_expand.png b/app/src/main/res/drawable-mdpi/ic_action_expand.png similarity index 100% rename from res/drawable-mdpi/ic_action_expand.png rename to app/src/main/res/drawable-mdpi/ic_action_expand.png diff --git a/res/drawable-mdpi/ic_action_flip.png b/app/src/main/res/drawable-mdpi/ic_action_flip.png similarity index 100% rename from res/drawable-mdpi/ic_action_flip.png rename to app/src/main/res/drawable-mdpi/ic_action_flip.png diff --git a/res/drawable-mdpi/ic_action_forward.png b/app/src/main/res/drawable-mdpi/ic_action_forward.png similarity index 100% rename from res/drawable-mdpi/ic_action_forward.png rename to app/src/main/res/drawable-mdpi/ic_action_forward.png diff --git a/res/drawable-mdpi/ic_action_fullscreen.png b/app/src/main/res/drawable-mdpi/ic_action_fullscreen.png similarity index 100% rename from res/drawable-mdpi/ic_action_fullscreen.png rename to app/src/main/res/drawable-mdpi/ic_action_fullscreen.png diff --git a/res/drawable-mdpi/ic_action_help.png b/app/src/main/res/drawable-mdpi/ic_action_help.png similarity index 100% rename from res/drawable-mdpi/ic_action_help.png rename to app/src/main/res/drawable-mdpi/ic_action_help.png diff --git a/res/drawable-mdpi/ic_action_import.png b/app/src/main/res/drawable-mdpi/ic_action_import.png similarity index 100% rename from res/drawable-mdpi/ic_action_import.png rename to app/src/main/res/drawable-mdpi/ic_action_import.png diff --git a/res/drawable-mdpi/ic_action_keyboard.png b/app/src/main/res/drawable-mdpi/ic_action_keyboard.png similarity index 100% rename from res/drawable-mdpi/ic_action_keyboard.png rename to app/src/main/res/drawable-mdpi/ic_action_keyboard.png diff --git a/res/drawable-mdpi/ic_action_left.png b/app/src/main/res/drawable-mdpi/ic_action_left.png similarity index 100% rename from res/drawable-mdpi/ic_action_left.png rename to app/src/main/res/drawable-mdpi/ic_action_left.png diff --git a/res/drawable-mdpi/ic_action_restart.png b/app/src/main/res/drawable-mdpi/ic_action_restart.png similarity index 100% rename from res/drawable-mdpi/ic_action_restart.png rename to app/src/main/res/drawable-mdpi/ic_action_restart.png diff --git a/res/drawable-mdpi/ic_action_restore.png b/app/src/main/res/drawable-mdpi/ic_action_restore.png similarity index 100% rename from res/drawable-mdpi/ic_action_restore.png rename to app/src/main/res/drawable-mdpi/ic_action_restore.png diff --git a/res/drawable-mdpi/ic_action_right.png b/app/src/main/res/drawable-mdpi/ic_action_right.png similarity index 100% rename from res/drawable-mdpi/ic_action_right.png rename to app/src/main/res/drawable-mdpi/ic_action_right.png diff --git a/res/drawable-mdpi/ic_action_save.png b/app/src/main/res/drawable-mdpi/ic_action_save.png similarity index 100% rename from res/drawable-mdpi/ic_action_save.png rename to app/src/main/res/drawable-mdpi/ic_action_save.png diff --git a/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png similarity index 100% rename from res/drawable-mdpi/ic_action_settings.png rename to app/src/main/res/drawable-mdpi/ic_action_settings.png diff --git a/res/drawable-mdpi/ic_action_submit.png b/app/src/main/res/drawable-mdpi/ic_action_submit.png similarity index 100% rename from res/drawable-mdpi/ic_action_submit.png rename to app/src/main/res/drawable-mdpi/ic_action_submit.png diff --git a/res/drawable-mdpi/ic_action_up.png b/app/src/main/res/drawable-mdpi/ic_action_up.png similarity index 100% rename from res/drawable-mdpi/ic_action_up.png rename to app/src/main/res/drawable-mdpi/ic_action_up.png diff --git a/res/drawable-mdpi/ic_action_user0.png b/app/src/main/res/drawable-mdpi/ic_action_user0.png similarity index 100% rename from res/drawable-mdpi/ic_action_user0.png rename to app/src/main/res/drawable-mdpi/ic_action_user0.png diff --git a/res/drawable-mdpi/ic_action_user1.png b/app/src/main/res/drawable-mdpi/ic_action_user1.png similarity index 100% rename from res/drawable-mdpi/ic_action_user1.png rename to app/src/main/res/drawable-mdpi/ic_action_user1.png diff --git a/res/drawable-mdpi/ic_action_user10.png b/app/src/main/res/drawable-mdpi/ic_action_user10.png similarity index 100% rename from res/drawable-mdpi/ic_action_user10.png rename to app/src/main/res/drawable-mdpi/ic_action_user10.png diff --git a/res/drawable-mdpi/ic_action_user11.png b/app/src/main/res/drawable-mdpi/ic_action_user11.png similarity index 100% rename from res/drawable-mdpi/ic_action_user11.png rename to app/src/main/res/drawable-mdpi/ic_action_user11.png diff --git a/res/drawable-mdpi/ic_action_user12.png b/app/src/main/res/drawable-mdpi/ic_action_user12.png similarity index 100% rename from res/drawable-mdpi/ic_action_user12.png rename to app/src/main/res/drawable-mdpi/ic_action_user12.png diff --git a/res/drawable-mdpi/ic_action_user13.png b/app/src/main/res/drawable-mdpi/ic_action_user13.png similarity index 100% rename from res/drawable-mdpi/ic_action_user13.png rename to app/src/main/res/drawable-mdpi/ic_action_user13.png diff --git a/res/drawable-mdpi/ic_action_user14.png b/app/src/main/res/drawable-mdpi/ic_action_user14.png similarity index 100% rename from res/drawable-mdpi/ic_action_user14.png rename to app/src/main/res/drawable-mdpi/ic_action_user14.png diff --git a/res/drawable-mdpi/ic_action_user15.png b/app/src/main/res/drawable-mdpi/ic_action_user15.png similarity index 100% rename from res/drawable-mdpi/ic_action_user15.png rename to app/src/main/res/drawable-mdpi/ic_action_user15.png diff --git a/res/drawable-mdpi/ic_action_user16.png b/app/src/main/res/drawable-mdpi/ic_action_user16.png similarity index 100% rename from res/drawable-mdpi/ic_action_user16.png rename to app/src/main/res/drawable-mdpi/ic_action_user16.png diff --git a/res/drawable-mdpi/ic_action_user17.png b/app/src/main/res/drawable-mdpi/ic_action_user17.png similarity index 100% rename from res/drawable-mdpi/ic_action_user17.png rename to app/src/main/res/drawable-mdpi/ic_action_user17.png diff --git a/res/drawable-mdpi/ic_action_user18.png b/app/src/main/res/drawable-mdpi/ic_action_user18.png similarity index 100% rename from res/drawable-mdpi/ic_action_user18.png rename to app/src/main/res/drawable-mdpi/ic_action_user18.png diff --git a/res/drawable-mdpi/ic_action_user19.png b/app/src/main/res/drawable-mdpi/ic_action_user19.png similarity index 100% rename from res/drawable-mdpi/ic_action_user19.png rename to app/src/main/res/drawable-mdpi/ic_action_user19.png diff --git a/res/drawable-mdpi/ic_action_user2.png b/app/src/main/res/drawable-mdpi/ic_action_user2.png similarity index 100% rename from res/drawable-mdpi/ic_action_user2.png rename to app/src/main/res/drawable-mdpi/ic_action_user2.png diff --git a/res/drawable-mdpi/ic_action_user20.png b/app/src/main/res/drawable-mdpi/ic_action_user20.png similarity index 100% rename from res/drawable-mdpi/ic_action_user20.png rename to app/src/main/res/drawable-mdpi/ic_action_user20.png diff --git a/res/drawable-mdpi/ic_action_user21.png b/app/src/main/res/drawable-mdpi/ic_action_user21.png similarity index 100% rename from res/drawable-mdpi/ic_action_user21.png rename to app/src/main/res/drawable-mdpi/ic_action_user21.png diff --git a/res/drawable-mdpi/ic_action_user22.png b/app/src/main/res/drawable-mdpi/ic_action_user22.png similarity index 100% rename from res/drawable-mdpi/ic_action_user22.png rename to app/src/main/res/drawable-mdpi/ic_action_user22.png diff --git a/res/drawable-mdpi/ic_action_user23.png b/app/src/main/res/drawable-mdpi/ic_action_user23.png similarity index 100% rename from res/drawable-mdpi/ic_action_user23.png rename to app/src/main/res/drawable-mdpi/ic_action_user23.png diff --git a/res/drawable-mdpi/ic_action_user24.png b/app/src/main/res/drawable-mdpi/ic_action_user24.png similarity index 100% rename from res/drawable-mdpi/ic_action_user24.png rename to app/src/main/res/drawable-mdpi/ic_action_user24.png diff --git a/res/drawable-mdpi/ic_action_user25.png b/app/src/main/res/drawable-mdpi/ic_action_user25.png similarity index 100% rename from res/drawable-mdpi/ic_action_user25.png rename to app/src/main/res/drawable-mdpi/ic_action_user25.png diff --git a/res/drawable-mdpi/ic_action_user26.png b/app/src/main/res/drawable-mdpi/ic_action_user26.png similarity index 100% rename from res/drawable-mdpi/ic_action_user26.png rename to app/src/main/res/drawable-mdpi/ic_action_user26.png diff --git a/res/drawable-mdpi/ic_action_user27.png b/app/src/main/res/drawable-mdpi/ic_action_user27.png similarity index 100% rename from res/drawable-mdpi/ic_action_user27.png rename to app/src/main/res/drawable-mdpi/ic_action_user27.png diff --git a/res/drawable-mdpi/ic_action_user28.png b/app/src/main/res/drawable-mdpi/ic_action_user28.png similarity index 100% rename from res/drawable-mdpi/ic_action_user28.png rename to app/src/main/res/drawable-mdpi/ic_action_user28.png diff --git a/res/drawable-mdpi/ic_action_user29.png b/app/src/main/res/drawable-mdpi/ic_action_user29.png similarity index 100% rename from res/drawable-mdpi/ic_action_user29.png rename to app/src/main/res/drawable-mdpi/ic_action_user29.png diff --git a/res/drawable-mdpi/ic_action_user3.png b/app/src/main/res/drawable-mdpi/ic_action_user3.png similarity index 100% rename from res/drawable-mdpi/ic_action_user3.png rename to app/src/main/res/drawable-mdpi/ic_action_user3.png diff --git a/res/drawable-mdpi/ic_action_user30.png b/app/src/main/res/drawable-mdpi/ic_action_user30.png similarity index 100% rename from res/drawable-mdpi/ic_action_user30.png rename to app/src/main/res/drawable-mdpi/ic_action_user30.png diff --git a/res/drawable-mdpi/ic_action_user31.png b/app/src/main/res/drawable-mdpi/ic_action_user31.png similarity index 100% rename from res/drawable-mdpi/ic_action_user31.png rename to app/src/main/res/drawable-mdpi/ic_action_user31.png diff --git a/res/drawable-mdpi/ic_action_user4.png b/app/src/main/res/drawable-mdpi/ic_action_user4.png similarity index 100% rename from res/drawable-mdpi/ic_action_user4.png rename to app/src/main/res/drawable-mdpi/ic_action_user4.png diff --git a/res/drawable-mdpi/ic_action_user5.png b/app/src/main/res/drawable-mdpi/ic_action_user5.png similarity index 100% rename from res/drawable-mdpi/ic_action_user5.png rename to app/src/main/res/drawable-mdpi/ic_action_user5.png diff --git a/res/drawable-mdpi/ic_action_user6.png b/app/src/main/res/drawable-mdpi/ic_action_user6.png similarity index 100% rename from res/drawable-mdpi/ic_action_user6.png rename to app/src/main/res/drawable-mdpi/ic_action_user6.png diff --git a/res/drawable-mdpi/ic_action_user7.png b/app/src/main/res/drawable-mdpi/ic_action_user7.png similarity index 100% rename from res/drawable-mdpi/ic_action_user7.png rename to app/src/main/res/drawable-mdpi/ic_action_user7.png diff --git a/res/drawable-mdpi/ic_action_user8.png b/app/src/main/res/drawable-mdpi/ic_action_user8.png similarity index 100% rename from res/drawable-mdpi/ic_action_user8.png rename to app/src/main/res/drawable-mdpi/ic_action_user8.png diff --git a/res/drawable-mdpi/ic_action_user9.png b/app/src/main/res/drawable-mdpi/ic_action_user9.png similarity index 100% rename from res/drawable-mdpi/ic_action_user9.png rename to app/src/main/res/drawable-mdpi/ic_action_user9.png diff --git a/res/drawable-mdpi/ic_compass_blank.png b/app/src/main/res/drawable-mdpi/ic_compass_blank.png similarity index 100% rename from res/drawable-mdpi/ic_compass_blank.png rename to app/src/main/res/drawable-mdpi/ic_compass_blank.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/clark_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xhdpi/clark_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/clark_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/clark_textfield_activated_holo_light.9.png diff --git a/res/drawable-xhdpi/clark_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xhdpi/clark_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/clark_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/clark_textfield_default_holo_light.9.png diff --git a/res/drawable-xhdpi/clark_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/clark_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/clark_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/clark_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/clark_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-xhdpi/clark_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/clark_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/clark_textfield_disabled_holo_light.9.png diff --git a/res/drawable-xhdpi/clark_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/clark_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/clark_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/clark_textfield_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/dinah_prompt_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/dinah_prompt_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_activated_holo_light.9.png diff --git a/res/drawable-xhdpi/dinah_prompt_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/dinah_prompt_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_default_holo_light.9.png diff --git a/res/drawable-xhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/dinah_prompt_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/dinah_prompt_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_disabled_holo_light.9.png diff --git a/res/drawable-xhdpi/dinah_prompt_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/dinah_prompt_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/dinah_prompt_textfield_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/ic_action_browse.png b/app/src/main/res/drawable-xhdpi/ic_action_browse.png similarity index 100% rename from res/drawable-xhdpi/ic_action_browse.png rename to app/src/main/res/drawable-xhdpi/ic_action_browse.png diff --git a/res/drawable-xhdpi/ic_action_clearlog.png b/app/src/main/res/drawable-xhdpi/ic_action_clearlog.png similarity index 100% rename from res/drawable-xhdpi/ic_action_clearlog.png rename to app/src/main/res/drawable-xhdpi/ic_action_clearlog.png diff --git a/res/drawable-xhdpi/ic_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_delete.png similarity index 100% rename from res/drawable-xhdpi/ic_action_delete.png rename to app/src/main/res/drawable-xhdpi/ic_action_delete.png diff --git a/res/drawable-xhdpi/ic_action_down.png b/app/src/main/res/drawable-xhdpi/ic_action_down.png similarity index 100% rename from res/drawable-xhdpi/ic_action_down.png rename to app/src/main/res/drawable-xhdpi/ic_action_down.png diff --git a/res/drawable-xhdpi/ic_action_expand.png b/app/src/main/res/drawable-xhdpi/ic_action_expand.png similarity index 100% rename from res/drawable-xhdpi/ic_action_expand.png rename to app/src/main/res/drawable-xhdpi/ic_action_expand.png diff --git a/res/drawable-xhdpi/ic_action_flip.png b/app/src/main/res/drawable-xhdpi/ic_action_flip.png similarity index 100% rename from res/drawable-xhdpi/ic_action_flip.png rename to app/src/main/res/drawable-xhdpi/ic_action_flip.png diff --git a/res/drawable-xhdpi/ic_action_forward.png b/app/src/main/res/drawable-xhdpi/ic_action_forward.png similarity index 100% rename from res/drawable-xhdpi/ic_action_forward.png rename to app/src/main/res/drawable-xhdpi/ic_action_forward.png diff --git a/res/drawable-xhdpi/ic_action_fullscreen.png b/app/src/main/res/drawable-xhdpi/ic_action_fullscreen.png similarity index 100% rename from res/drawable-xhdpi/ic_action_fullscreen.png rename to app/src/main/res/drawable-xhdpi/ic_action_fullscreen.png diff --git a/res/drawable-xhdpi/ic_action_help.png b/app/src/main/res/drawable-xhdpi/ic_action_help.png similarity index 100% rename from res/drawable-xhdpi/ic_action_help.png rename to app/src/main/res/drawable-xhdpi/ic_action_help.png diff --git a/res/drawable-xhdpi/ic_action_import.png b/app/src/main/res/drawable-xhdpi/ic_action_import.png similarity index 100% rename from res/drawable-xhdpi/ic_action_import.png rename to app/src/main/res/drawable-xhdpi/ic_action_import.png diff --git a/res/drawable-xhdpi/ic_action_keyboard.png b/app/src/main/res/drawable-xhdpi/ic_action_keyboard.png similarity index 100% rename from res/drawable-xhdpi/ic_action_keyboard.png rename to app/src/main/res/drawable-xhdpi/ic_action_keyboard.png diff --git a/res/drawable-xhdpi/ic_action_left.png b/app/src/main/res/drawable-xhdpi/ic_action_left.png similarity index 100% rename from res/drawable-xhdpi/ic_action_left.png rename to app/src/main/res/drawable-xhdpi/ic_action_left.png diff --git a/res/drawable-xhdpi/ic_action_restart.png b/app/src/main/res/drawable-xhdpi/ic_action_restart.png similarity index 100% rename from res/drawable-xhdpi/ic_action_restart.png rename to app/src/main/res/drawable-xhdpi/ic_action_restart.png diff --git a/res/drawable-xhdpi/ic_action_restore.png b/app/src/main/res/drawable-xhdpi/ic_action_restore.png similarity index 100% rename from res/drawable-xhdpi/ic_action_restore.png rename to app/src/main/res/drawable-xhdpi/ic_action_restore.png diff --git a/res/drawable-xhdpi/ic_action_right.png b/app/src/main/res/drawable-xhdpi/ic_action_right.png similarity index 100% rename from res/drawable-xhdpi/ic_action_right.png rename to app/src/main/res/drawable-xhdpi/ic_action_right.png diff --git a/res/drawable-xhdpi/ic_action_save.png b/app/src/main/res/drawable-xhdpi/ic_action_save.png similarity index 100% rename from res/drawable-xhdpi/ic_action_save.png rename to app/src/main/res/drawable-xhdpi/ic_action_save.png diff --git a/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png similarity index 100% rename from res/drawable-xhdpi/ic_action_settings.png rename to app/src/main/res/drawable-xhdpi/ic_action_settings.png diff --git a/res/drawable-xhdpi/ic_action_submit.png b/app/src/main/res/drawable-xhdpi/ic_action_submit.png similarity index 100% rename from res/drawable-xhdpi/ic_action_submit.png rename to app/src/main/res/drawable-xhdpi/ic_action_submit.png diff --git a/res/drawable-xhdpi/ic_action_up.png b/app/src/main/res/drawable-xhdpi/ic_action_up.png similarity index 100% rename from res/drawable-xhdpi/ic_action_up.png rename to app/src/main/res/drawable-xhdpi/ic_action_up.png diff --git a/res/drawable-xhdpi/ic_action_user0.png b/app/src/main/res/drawable-xhdpi/ic_action_user0.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user0.png rename to app/src/main/res/drawable-xhdpi/ic_action_user0.png diff --git a/res/drawable-xhdpi/ic_action_user1.png b/app/src/main/res/drawable-xhdpi/ic_action_user1.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user1.png rename to app/src/main/res/drawable-xhdpi/ic_action_user1.png diff --git a/res/drawable-xhdpi/ic_action_user10.png b/app/src/main/res/drawable-xhdpi/ic_action_user10.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user10.png rename to app/src/main/res/drawable-xhdpi/ic_action_user10.png diff --git a/res/drawable-xhdpi/ic_action_user11.png b/app/src/main/res/drawable-xhdpi/ic_action_user11.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user11.png rename to app/src/main/res/drawable-xhdpi/ic_action_user11.png diff --git a/res/drawable-xhdpi/ic_action_user12.png b/app/src/main/res/drawable-xhdpi/ic_action_user12.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user12.png rename to app/src/main/res/drawable-xhdpi/ic_action_user12.png diff --git a/res/drawable-xhdpi/ic_action_user13.png b/app/src/main/res/drawable-xhdpi/ic_action_user13.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user13.png rename to app/src/main/res/drawable-xhdpi/ic_action_user13.png diff --git a/res/drawable-xhdpi/ic_action_user14.png b/app/src/main/res/drawable-xhdpi/ic_action_user14.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user14.png rename to app/src/main/res/drawable-xhdpi/ic_action_user14.png diff --git a/res/drawable-xhdpi/ic_action_user15.png b/app/src/main/res/drawable-xhdpi/ic_action_user15.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user15.png rename to app/src/main/res/drawable-xhdpi/ic_action_user15.png diff --git a/res/drawable-xhdpi/ic_action_user16.png b/app/src/main/res/drawable-xhdpi/ic_action_user16.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user16.png rename to app/src/main/res/drawable-xhdpi/ic_action_user16.png diff --git a/res/drawable-xhdpi/ic_action_user17.png b/app/src/main/res/drawable-xhdpi/ic_action_user17.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user17.png rename to app/src/main/res/drawable-xhdpi/ic_action_user17.png diff --git a/res/drawable-xhdpi/ic_action_user18.png b/app/src/main/res/drawable-xhdpi/ic_action_user18.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user18.png rename to app/src/main/res/drawable-xhdpi/ic_action_user18.png diff --git a/res/drawable-xhdpi/ic_action_user19.png b/app/src/main/res/drawable-xhdpi/ic_action_user19.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user19.png rename to app/src/main/res/drawable-xhdpi/ic_action_user19.png diff --git a/res/drawable-xhdpi/ic_action_user2.png b/app/src/main/res/drawable-xhdpi/ic_action_user2.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user2.png rename to app/src/main/res/drawable-xhdpi/ic_action_user2.png diff --git a/res/drawable-xhdpi/ic_action_user20.png b/app/src/main/res/drawable-xhdpi/ic_action_user20.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user20.png rename to app/src/main/res/drawable-xhdpi/ic_action_user20.png diff --git a/res/drawable-xhdpi/ic_action_user21.png b/app/src/main/res/drawable-xhdpi/ic_action_user21.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user21.png rename to app/src/main/res/drawable-xhdpi/ic_action_user21.png diff --git a/res/drawable-xhdpi/ic_action_user22.png b/app/src/main/res/drawable-xhdpi/ic_action_user22.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user22.png rename to app/src/main/res/drawable-xhdpi/ic_action_user22.png diff --git a/res/drawable-xhdpi/ic_action_user23.png b/app/src/main/res/drawable-xhdpi/ic_action_user23.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user23.png rename to app/src/main/res/drawable-xhdpi/ic_action_user23.png diff --git a/res/drawable-xhdpi/ic_action_user24.png b/app/src/main/res/drawable-xhdpi/ic_action_user24.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user24.png rename to app/src/main/res/drawable-xhdpi/ic_action_user24.png diff --git a/res/drawable-xhdpi/ic_action_user25.png b/app/src/main/res/drawable-xhdpi/ic_action_user25.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user25.png rename to app/src/main/res/drawable-xhdpi/ic_action_user25.png diff --git a/res/drawable-xhdpi/ic_action_user26.png b/app/src/main/res/drawable-xhdpi/ic_action_user26.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user26.png rename to app/src/main/res/drawable-xhdpi/ic_action_user26.png diff --git a/res/drawable-xhdpi/ic_action_user27.png b/app/src/main/res/drawable-xhdpi/ic_action_user27.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user27.png rename to app/src/main/res/drawable-xhdpi/ic_action_user27.png diff --git a/res/drawable-xhdpi/ic_action_user28.png b/app/src/main/res/drawable-xhdpi/ic_action_user28.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user28.png rename to app/src/main/res/drawable-xhdpi/ic_action_user28.png diff --git a/res/drawable-xhdpi/ic_action_user29.png b/app/src/main/res/drawable-xhdpi/ic_action_user29.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user29.png rename to app/src/main/res/drawable-xhdpi/ic_action_user29.png diff --git a/res/drawable-xhdpi/ic_action_user3.png b/app/src/main/res/drawable-xhdpi/ic_action_user3.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user3.png rename to app/src/main/res/drawable-xhdpi/ic_action_user3.png diff --git a/res/drawable-xhdpi/ic_action_user30.png b/app/src/main/res/drawable-xhdpi/ic_action_user30.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user30.png rename to app/src/main/res/drawable-xhdpi/ic_action_user30.png diff --git a/res/drawable-xhdpi/ic_action_user31.png b/app/src/main/res/drawable-xhdpi/ic_action_user31.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user31.png rename to app/src/main/res/drawable-xhdpi/ic_action_user31.png diff --git a/res/drawable-xhdpi/ic_action_user4.png b/app/src/main/res/drawable-xhdpi/ic_action_user4.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user4.png rename to app/src/main/res/drawable-xhdpi/ic_action_user4.png diff --git a/res/drawable-xhdpi/ic_action_user5.png b/app/src/main/res/drawable-xhdpi/ic_action_user5.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user5.png rename to app/src/main/res/drawable-xhdpi/ic_action_user5.png diff --git a/res/drawable-xhdpi/ic_action_user6.png b/app/src/main/res/drawable-xhdpi/ic_action_user6.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user6.png rename to app/src/main/res/drawable-xhdpi/ic_action_user6.png diff --git a/res/drawable-xhdpi/ic_action_user7.png b/app/src/main/res/drawable-xhdpi/ic_action_user7.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user7.png rename to app/src/main/res/drawable-xhdpi/ic_action_user7.png diff --git a/res/drawable-xhdpi/ic_action_user8.png b/app/src/main/res/drawable-xhdpi/ic_action_user8.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user8.png rename to app/src/main/res/drawable-xhdpi/ic_action_user8.png diff --git a/res/drawable-xhdpi/ic_action_user9.png b/app/src/main/res/drawable-xhdpi/ic_action_user9.png similarity index 100% rename from res/drawable-xhdpi/ic_action_user9.png rename to app/src/main/res/drawable-xhdpi/ic_action_user9.png diff --git a/res/drawable-xhdpi/ic_compass_blank.png b/app/src/main/res/drawable-xhdpi/ic_compass_blank.png similarity index 100% rename from res/drawable-xhdpi/ic_compass_blank.png rename to app/src/main/res/drawable-xhdpi/ic_compass_blank.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/clark_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/clark_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/clark_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/clark_textfield_activated_holo_light.9.png diff --git a/res/drawable-xxhdpi/clark_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/clark_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/clark_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/clark_textfield_default_holo_light.9.png diff --git a/res/drawable-xxhdpi/clark_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/clark_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/clark_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/clark_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-xxhdpi/clark_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/clark_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/clark_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/clark_textfield_disabled_holo_light.9.png diff --git a/res/drawable-xxhdpi/clark_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/clark_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/clark_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/clark_textfield_focused_holo_light.9.png diff --git a/res/drawable-xxhdpi/dinah_prompt_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/dinah_prompt_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_activated_holo_light.9.png diff --git a/res/drawable-xxhdpi/dinah_prompt_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/dinah_prompt_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_default_holo_light.9.png diff --git a/res/drawable-xxhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-xxhdpi/dinah_prompt_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/dinah_prompt_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_disabled_holo_light.9.png diff --git a/res/drawable-xxhdpi/dinah_prompt_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/dinah_prompt_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/dinah_prompt_textfield_focused_holo_light.9.png diff --git a/res/drawable-xxhdpi/ic_action_down.png b/app/src/main/res/drawable-xxhdpi/ic_action_down.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_down.png rename to app/src/main/res/drawable-xxhdpi/ic_action_down.png diff --git a/res/drawable-xxhdpi/ic_action_forward.png b/app/src/main/res/drawable-xxhdpi/ic_action_forward.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_forward.png rename to app/src/main/res/drawable-xxhdpi/ic_action_forward.png diff --git a/res/drawable-xxhdpi/ic_action_keyboard.png b/app/src/main/res/drawable-xxhdpi/ic_action_keyboard.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_keyboard.png rename to app/src/main/res/drawable-xxhdpi/ic_action_keyboard.png diff --git a/res/drawable-xxhdpi/ic_action_left.png b/app/src/main/res/drawable-xxhdpi/ic_action_left.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_left.png rename to app/src/main/res/drawable-xxhdpi/ic_action_left.png diff --git a/res/drawable-xxhdpi/ic_action_right.png b/app/src/main/res/drawable-xxhdpi/ic_action_right.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_right.png rename to app/src/main/res/drawable-xxhdpi/ic_action_right.png diff --git a/res/drawable-xxhdpi/ic_action_up.png b/app/src/main/res/drawable-xxhdpi/ic_action_up.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_up.png rename to app/src/main/res/drawable-xxhdpi/ic_action_up.png diff --git a/res/drawable-xxhdpi/ic_action_user0.png b/app/src/main/res/drawable-xxhdpi/ic_action_user0.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user0.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user0.png diff --git a/res/drawable-xxhdpi/ic_action_user1.png b/app/src/main/res/drawable-xxhdpi/ic_action_user1.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user1.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user1.png diff --git a/res/drawable-xxhdpi/ic_action_user10.png b/app/src/main/res/drawable-xxhdpi/ic_action_user10.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user10.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user10.png diff --git a/res/drawable-xxhdpi/ic_action_user11.png b/app/src/main/res/drawable-xxhdpi/ic_action_user11.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user11.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user11.png diff --git a/res/drawable-xxhdpi/ic_action_user12.png b/app/src/main/res/drawable-xxhdpi/ic_action_user12.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user12.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user12.png diff --git a/res/drawable-xxhdpi/ic_action_user13.png b/app/src/main/res/drawable-xxhdpi/ic_action_user13.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user13.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user13.png diff --git a/res/drawable-xxhdpi/ic_action_user14.png b/app/src/main/res/drawable-xxhdpi/ic_action_user14.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user14.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user14.png diff --git a/res/drawable-xxhdpi/ic_action_user15.png b/app/src/main/res/drawable-xxhdpi/ic_action_user15.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user15.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user15.png diff --git a/res/drawable-xxhdpi/ic_action_user16.png b/app/src/main/res/drawable-xxhdpi/ic_action_user16.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user16.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user16.png diff --git a/res/drawable-xxhdpi/ic_action_user17.png b/app/src/main/res/drawable-xxhdpi/ic_action_user17.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user17.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user17.png diff --git a/res/drawable-xxhdpi/ic_action_user18.png b/app/src/main/res/drawable-xxhdpi/ic_action_user18.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user18.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user18.png diff --git a/res/drawable-xxhdpi/ic_action_user19.png b/app/src/main/res/drawable-xxhdpi/ic_action_user19.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user19.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user19.png diff --git a/res/drawable-xxhdpi/ic_action_user2.png b/app/src/main/res/drawable-xxhdpi/ic_action_user2.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user2.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user2.png diff --git a/res/drawable-xxhdpi/ic_action_user20.png b/app/src/main/res/drawable-xxhdpi/ic_action_user20.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user20.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user20.png diff --git a/res/drawable-xxhdpi/ic_action_user21.png b/app/src/main/res/drawable-xxhdpi/ic_action_user21.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user21.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user21.png diff --git a/res/drawable-xxhdpi/ic_action_user22.png b/app/src/main/res/drawable-xxhdpi/ic_action_user22.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user22.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user22.png diff --git a/res/drawable-xxhdpi/ic_action_user23.png b/app/src/main/res/drawable-xxhdpi/ic_action_user23.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user23.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user23.png diff --git a/res/drawable-xxhdpi/ic_action_user24.png b/app/src/main/res/drawable-xxhdpi/ic_action_user24.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user24.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user24.png diff --git a/res/drawable-xxhdpi/ic_action_user25.png b/app/src/main/res/drawable-xxhdpi/ic_action_user25.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user25.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user25.png diff --git a/res/drawable-xxhdpi/ic_action_user26.png b/app/src/main/res/drawable-xxhdpi/ic_action_user26.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user26.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user26.png diff --git a/res/drawable-xxhdpi/ic_action_user27.png b/app/src/main/res/drawable-xxhdpi/ic_action_user27.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user27.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user27.png diff --git a/res/drawable-xxhdpi/ic_action_user28.png b/app/src/main/res/drawable-xxhdpi/ic_action_user28.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user28.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user28.png diff --git a/res/drawable-xxhdpi/ic_action_user29.png b/app/src/main/res/drawable-xxhdpi/ic_action_user29.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user29.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user29.png diff --git a/res/drawable-xxhdpi/ic_action_user3.png b/app/src/main/res/drawable-xxhdpi/ic_action_user3.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user3.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user3.png diff --git a/res/drawable-xxhdpi/ic_action_user30.png b/app/src/main/res/drawable-xxhdpi/ic_action_user30.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user30.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user30.png diff --git a/res/drawable-xxhdpi/ic_action_user31.png b/app/src/main/res/drawable-xxhdpi/ic_action_user31.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user31.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user31.png diff --git a/res/drawable-xxhdpi/ic_action_user4.png b/app/src/main/res/drawable-xxhdpi/ic_action_user4.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user4.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user4.png diff --git a/res/drawable-xxhdpi/ic_action_user5.png b/app/src/main/res/drawable-xxhdpi/ic_action_user5.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user5.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user5.png diff --git a/res/drawable-xxhdpi/ic_action_user6.png b/app/src/main/res/drawable-xxhdpi/ic_action_user6.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user6.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user6.png diff --git a/res/drawable-xxhdpi/ic_action_user7.png b/app/src/main/res/drawable-xxhdpi/ic_action_user7.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user7.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user7.png diff --git a/res/drawable-xxhdpi/ic_action_user8.png b/app/src/main/res/drawable-xxhdpi/ic_action_user8.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user8.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user8.png diff --git a/res/drawable-xxhdpi/ic_action_user9.png b/app/src/main/res/drawable-xxhdpi/ic_action_user9.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_user9.png rename to app/src/main/res/drawable-xxhdpi/ic_action_user9.png diff --git a/res/drawable-xxhdpi/ic_compass_blank.png b/app/src/main/res/drawable-xxhdpi/ic_compass_blank.png similarity index 100% rename from res/drawable-xxhdpi/ic_compass_blank.png rename to app/src/main/res/drawable-xxhdpi/ic_compass_blank.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable/alice_box.9.png b/app/src/main/res/drawable/alice_box.9.png similarity index 100% rename from res/drawable/alice_box.9.png rename to app/src/main/res/drawable/alice_box.9.png diff --git a/res/drawable/alice_btn_pressed.xml b/app/src/main/res/drawable/alice_btn_pressed.xml similarity index 100% rename from res/drawable/alice_btn_pressed.xml rename to app/src/main/res/drawable/alice_btn_pressed.xml diff --git a/res/drawable/alice_btn_selector.xml b/app/src/main/res/drawable/alice_btn_selector.xml similarity index 100% rename from res/drawable/alice_btn_selector.xml rename to app/src/main/res/drawable/alice_btn_selector.xml diff --git a/res/drawable/alice_bubble_left.9.png b/app/src/main/res/drawable/alice_bubble_left.9.png similarity index 100% rename from res/drawable/alice_bubble_left.9.png rename to app/src/main/res/drawable/alice_bubble_left.9.png diff --git a/res/drawable/alice_bubble_right.9.png b/app/src/main/res/drawable/alice_bubble_right.9.png similarity index 100% rename from res/drawable/alice_bubble_right.9.png rename to app/src/main/res/drawable/alice_bubble_right.9.png diff --git a/res/drawable/alice_inputbox.9.png b/app/src/main/res/drawable/alice_inputbox.9.png similarity index 100% rename from res/drawable/alice_inputbox.9.png rename to app/src/main/res/drawable/alice_inputbox.9.png diff --git a/res/drawable/alice_item_pressed.xml b/app/src/main/res/drawable/alice_item_pressed.xml similarity index 100% rename from res/drawable/alice_item_pressed.xml rename to app/src/main/res/drawable/alice_item_pressed.xml diff --git a/res/drawable/alice_loading.xml b/app/src/main/res/drawable/alice_loading.xml similarity index 100% rename from res/drawable/alice_loading.xml rename to app/src/main/res/drawable/alice_loading.xml diff --git a/res/drawable/alice_lst_selector.xml b/app/src/main/res/drawable/alice_lst_selector.xml similarity index 100% rename from res/drawable/alice_lst_selector.xml rename to app/src/main/res/drawable/alice_lst_selector.xml diff --git a/res/drawable/dinah_background.xml b/app/src/main/res/drawable/dinah_background.xml similarity index 100% rename from res/drawable/dinah_background.xml rename to app/src/main/res/drawable/dinah_background.xml diff --git a/res/drawable/dinah_btn_selector.xml b/app/src/main/res/drawable/dinah_btn_selector.xml similarity index 100% rename from res/drawable/dinah_btn_selector.xml rename to app/src/main/res/drawable/dinah_btn_selector.xml diff --git a/res/drawable/dinah_bubble_left.9.png b/app/src/main/res/drawable/dinah_bubble_left.9.png similarity index 100% rename from res/drawable/dinah_bubble_left.9.png rename to app/src/main/res/drawable/dinah_bubble_left.9.png diff --git a/res/drawable/dinah_bubble_right.9.png b/app/src/main/res/drawable/dinah_bubble_right.9.png similarity index 100% rename from res/drawable/dinah_bubble_right.9.png rename to app/src/main/res/drawable/dinah_bubble_right.9.png diff --git a/res/drawable/dinah_button_down.9.png b/app/src/main/res/drawable/dinah_button_down.9.png similarity index 100% rename from res/drawable/dinah_button_down.9.png rename to app/src/main/res/drawable/dinah_button_down.9.png diff --git a/res/drawable/dinah_button_up.9.png b/app/src/main/res/drawable/dinah_button_up.9.png similarity index 100% rename from res/drawable/dinah_button_up.9.png rename to app/src/main/res/drawable/dinah_button_up.9.png diff --git a/res/drawable/dinah_buttonbox.xml b/app/src/main/res/drawable/dinah_buttonbox.xml similarity index 100% rename from res/drawable/dinah_buttonbox.xml rename to app/src/main/res/drawable/dinah_buttonbox.xml diff --git a/res/drawable/dinah_loading.xml b/app/src/main/res/drawable/dinah_loading.xml similarity index 100% rename from res/drawable/dinah_loading.xml rename to app/src/main/res/drawable/dinah_loading.xml diff --git a/res/drawable/dinah_lst_selector.xml b/app/src/main/res/drawable/dinah_lst_selector.xml similarity index 100% rename from res/drawable/dinah_lst_selector.xml rename to app/src/main/res/drawable/dinah_lst_selector.xml diff --git a/res/drawable/dinah_prompt_edit_text_holo_light.xml b/app/src/main/res/drawable/dinah_prompt_edit_text_holo_light.xml similarity index 100% rename from res/drawable/dinah_prompt_edit_text_holo_light.xml rename to app/src/main/res/drawable/dinah_prompt_edit_text_holo_light.xml diff --git a/res/drawable/grue_box.9.png b/app/src/main/res/drawable/grue_box.9.png similarity index 100% rename from res/drawable/grue_box.9.png rename to app/src/main/res/drawable/grue_box.9.png diff --git a/res/drawable/grue_item_pressed.xml b/app/src/main/res/drawable/grue_item_pressed.xml similarity index 100% rename from res/drawable/grue_item_pressed.xml rename to app/src/main/res/drawable/grue_item_pressed.xml diff --git a/res/drawable/grue_lst_selector.xml b/app/src/main/res/drawable/grue_lst_selector.xml similarity index 100% rename from res/drawable/grue_lst_selector.xml rename to app/src/main/res/drawable/grue_lst_selector.xml diff --git a/res/drawable/jason_loading.xml b/app/src/main/res/drawable/jason_loading.xml similarity index 100% rename from res/drawable/jason_loading.xml rename to app/src/main/res/drawable/jason_loading.xml diff --git a/res/drawable/lucy_box.9.png b/app/src/main/res/drawable/lucy_box.9.png similarity index 100% rename from res/drawable/lucy_box.9.png rename to app/src/main/res/drawable/lucy_box.9.png diff --git a/res/drawable/lucy_btn_pressed.xml b/app/src/main/res/drawable/lucy_btn_pressed.xml similarity index 100% rename from res/drawable/lucy_btn_pressed.xml rename to app/src/main/res/drawable/lucy_btn_pressed.xml diff --git a/res/drawable/lucy_btn_selector.xml b/app/src/main/res/drawable/lucy_btn_selector.xml similarity index 100% rename from res/drawable/lucy_btn_selector.xml rename to app/src/main/res/drawable/lucy_btn_selector.xml diff --git a/res/drawable/lucy_bubble_left.9.png b/app/src/main/res/drawable/lucy_bubble_left.9.png similarity index 100% rename from res/drawable/lucy_bubble_left.9.png rename to app/src/main/res/drawable/lucy_bubble_left.9.png diff --git a/res/drawable/lucy_bubble_right.9.png b/app/src/main/res/drawable/lucy_bubble_right.9.png similarity index 100% rename from res/drawable/lucy_bubble_right.9.png rename to app/src/main/res/drawable/lucy_bubble_right.9.png diff --git a/res/drawable/lucy_inputbox.9.png b/app/src/main/res/drawable/lucy_inputbox.9.png similarity index 100% rename from res/drawable/lucy_inputbox.9.png rename to app/src/main/res/drawable/lucy_inputbox.9.png diff --git a/res/drawable/lucy_item_pressed.xml b/app/src/main/res/drawable/lucy_item_pressed.xml similarity index 100% rename from res/drawable/lucy_item_pressed.xml rename to app/src/main/res/drawable/lucy_item_pressed.xml diff --git a/res/drawable/lucy_loading.xml b/app/src/main/res/drawable/lucy_loading.xml similarity index 100% rename from res/drawable/lucy_loading.xml rename to app/src/main/res/drawable/lucy_loading.xml diff --git a/res/drawable/lucy_lst_selector.xml b/app/src/main/res/drawable/lucy_lst_selector.xml similarity index 100% rename from res/drawable/lucy_lst_selector.xml rename to app/src/main/res/drawable/lucy_lst_selector.xml diff --git a/res/drawable/lucy_textfield_activated.9.png b/app/src/main/res/drawable/lucy_textfield_activated.9.png similarity index 100% rename from res/drawable/lucy_textfield_activated.9.png rename to app/src/main/res/drawable/lucy_textfield_activated.9.png diff --git a/res/drawable/nemo_box.9.png b/app/src/main/res/drawable/nemo_box.9.png similarity index 100% rename from res/drawable/nemo_box.9.png rename to app/src/main/res/drawable/nemo_box.9.png diff --git a/res/drawable/nemo_btn_pressed.xml b/app/src/main/res/drawable/nemo_btn_pressed.xml similarity index 100% rename from res/drawable/nemo_btn_pressed.xml rename to app/src/main/res/drawable/nemo_btn_pressed.xml diff --git a/res/drawable/nemo_btn_selector.xml b/app/src/main/res/drawable/nemo_btn_selector.xml similarity index 100% rename from res/drawable/nemo_btn_selector.xml rename to app/src/main/res/drawable/nemo_btn_selector.xml diff --git a/res/drawable/nemo_bubble_left.9.png b/app/src/main/res/drawable/nemo_bubble_left.9.png similarity index 100% rename from res/drawable/nemo_bubble_left.9.png rename to app/src/main/res/drawable/nemo_bubble_left.9.png diff --git a/res/drawable/nemo_bubble_right.9.png b/app/src/main/res/drawable/nemo_bubble_right.9.png similarity index 100% rename from res/drawable/nemo_bubble_right.9.png rename to app/src/main/res/drawable/nemo_bubble_right.9.png diff --git a/res/drawable/nemo_item_pressed.xml b/app/src/main/res/drawable/nemo_item_pressed.xml similarity index 100% rename from res/drawable/nemo_item_pressed.xml rename to app/src/main/res/drawable/nemo_item_pressed.xml diff --git a/res/drawable/nemo_loading.xml b/app/src/main/res/drawable/nemo_loading.xml similarity index 100% rename from res/drawable/nemo_loading.xml rename to app/src/main/res/drawable/nemo_loading.xml diff --git a/res/drawable/nemo_lst_selector.xml b/app/src/main/res/drawable/nemo_lst_selector.xml similarity index 100% rename from res/drawable/nemo_lst_selector.xml rename to app/src/main/res/drawable/nemo_lst_selector.xml diff --git a/res/drawable/shadedregion.9.png b/app/src/main/res/drawable/shadedregion.9.png similarity index 100% rename from res/drawable/shadedregion.9.png rename to app/src/main/res/drawable/shadedregion.9.png diff --git a/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml similarity index 100% rename from res/layout/activity_game.xml rename to app/src/main/res/layout/activity_game.xml diff --git a/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml similarity index 100% rename from res/layout/activity_setting.xml rename to app/src/main/res/layout/activity_setting.xml diff --git a/res/layout/fragment_compass.xml b/app/src/main/res/layout/fragment_compass.xml similarity index 100% rename from res/layout/fragment_compass.xml rename to app/src/main/res/layout/fragment_compass.xml diff --git a/res/layout/fragment_input.xml b/app/src/main/res/layout/fragment_input.xml similarity index 100% rename from res/layout/fragment_input.xml rename to app/src/main/res/layout/fragment_input.xml diff --git a/res/layout/fragment_library_grid.xml b/app/src/main/res/layout/fragment_library_grid.xml similarity index 100% rename from res/layout/fragment_library_grid.xml rename to app/src/main/res/layout/fragment_library_grid.xml diff --git a/res/layout/fragment_library_list.xml b/app/src/main/res/layout/fragment_library_list.xml similarity index 100% rename from res/layout/fragment_library_list.xml rename to app/src/main/res/layout/fragment_library_list.xml diff --git a/res/layout/library_item.xml b/app/src/main/res/layout/library_item.xml similarity index 100% rename from res/layout/library_item.xml rename to app/src/main/res/layout/library_item.xml diff --git a/res/layout/quickcmdsettings.xml b/app/src/main/res/layout/quickcmdsettings.xml similarity index 100% rename from res/layout/quickcmdsettings.xml rename to app/src/main/res/layout/quickcmdsettings.xml diff --git a/res/layout/story_item.xml b/app/src/main/res/layout/story_item.xml similarity index 100% rename from res/layout/story_item.xml rename to app/src/main/res/layout/story_item.xml diff --git a/res/layout/style_cmdbutton.xml b/app/src/main/res/layout/style_cmdbutton.xml similarity index 100% rename from res/layout/style_cmdbutton.xml rename to app/src/main/res/layout/style_cmdbutton.xml diff --git a/res/menu/game.xml b/app/src/main/res/menu/game.xml similarity index 100% rename from res/menu/game.xml rename to app/src/main/res/menu/game.xml diff --git a/res/menu/library_fragment.xml b/app/src/main/res/menu/library_fragment.xml similarity index 100% rename from res/menu/library_fragment.xml rename to app/src/main/res/menu/library_fragment.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/menu/setting.xml b/app/src/main/res/menu/setting.xml similarity index 100% rename from res/menu/setting.xml rename to app/src/main/res/menu/setting.xml diff --git a/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/res/values-cs/strings_settings.xml b/app/src/main/res/values-cs/strings_settings.xml similarity index 100% rename from res/values-cs/strings_settings.xml rename to app/src/main/res/values-cs/strings_settings.xml diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/res/values-de/strings_settings.xml b/app/src/main/res/values-de/strings_settings.xml similarity index 100% rename from res/values-de/strings_settings.xml rename to app/src/main/res/values-de/strings_settings.xml diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/res/values-es/strings_custom.xml b/app/src/main/res/values-es/strings_custom.xml similarity index 100% rename from res/values-es/strings_custom.xml rename to app/src/main/res/values-es/strings_custom.xml diff --git a/res/values-es/strings_settings.xml b/app/src/main/res/values-es/strings_settings.xml similarity index 100% rename from res/values-es/strings_settings.xml rename to app/src/main/res/values-es/strings_settings.xml diff --git a/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/res/values-it/strings_settings.xml b/app/src/main/res/values-it/strings_settings.xml similarity index 100% rename from res/values-it/strings_settings.xml rename to app/src/main/res/values-it/strings_settings.xml diff --git a/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml similarity index 100% rename from res/values-large/dimens.xml rename to app/src/main/res/values-large/dimens.xml diff --git a/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml similarity index 100% rename from res/values-large/refs.xml rename to app/src/main/res/values-large/refs.xml diff --git a/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from res/values-sw600dp/dimens.xml rename to app/src/main/res/values-sw600dp/dimens.xml diff --git a/res/values-sw600dp/refs.xml b/app/src/main/res/values-sw600dp/refs.xml similarity index 100% rename from res/values-sw600dp/refs.xml rename to app/src/main/res/values-sw600dp/refs.xml diff --git a/res/values-sw720dp-land/dimens.xml b/app/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from res/values-sw720dp-land/dimens.xml rename to app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/refs.xml b/app/src/main/res/values/refs.xml similarity index 100% rename from res/values/refs.xml rename to app/src/main/res/values/refs.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/strings_accessible.xml b/app/src/main/res/values/strings_accessible.xml similarity index 100% rename from res/values/strings_accessible.xml rename to app/src/main/res/values/strings_accessible.xml diff --git a/res/values/strings_custom.xml b/app/src/main/res/values/strings_custom.xml similarity index 100% rename from res/values/strings_custom.xml rename to app/src/main/res/values/strings_custom.xml diff --git a/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml similarity index 100% rename from res/values/strings_settings.xml rename to app/src/main/res/values/strings_settings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/values/styles_alice.xml b/app/src/main/res/values/styles_alice.xml similarity index 100% rename from res/values/styles_alice.xml rename to app/src/main/res/values/styles_alice.xml diff --git a/res/values/styles_atalanta.xml b/app/src/main/res/values/styles_atalanta.xml similarity index 100% rename from res/values/styles_atalanta.xml rename to app/src/main/res/values/styles_atalanta.xml diff --git a/res/values/styles_dinah.xml b/app/src/main/res/values/styles_dinah.xml similarity index 100% rename from res/values/styles_dinah.xml rename to app/src/main/res/values/styles_dinah.xml diff --git a/res/values/styles_grue.xml b/app/src/main/res/values/styles_grue.xml similarity index 100% rename from res/values/styles_grue.xml rename to app/src/main/res/values/styles_grue.xml diff --git a/res/values/styles_jason.xml b/app/src/main/res/values/styles_jason.xml similarity index 100% rename from res/values/styles_jason.xml rename to app/src/main/res/values/styles_jason.xml diff --git a/res/values/styles_lucy.xml b/app/src/main/res/values/styles_lucy.xml similarity index 100% rename from res/values/styles_lucy.xml rename to app/src/main/res/values/styles_lucy.xml diff --git a/res/values/styles_mina.xml b/app/src/main/res/values/styles_mina.xml similarity index 100% rename from res/values/styles_mina.xml rename to app/src/main/res/values/styles_mina.xml diff --git a/res/values/styles_nemo.xml b/app/src/main/res/values/styles_nemo.xml similarity index 100% rename from res/values/styles_nemo.xml rename to app/src/main/res/values/styles_nemo.xml diff --git a/res/xml/settings.xml b/app/src/main/res/xml/settings.xml similarity index 100% rename from res/xml/settings.xml rename to app/src/main/res/xml/settings.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..565f8c2 --- /dev/null +++ b/build.gradle @@ -0,0 +1,4 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { +alias(libs.plugins.android.application) apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4387edc --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..9f99e10 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,18 @@ +[versions] +agp = "8.13.2" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" +appcompat = "1.7.1" +material = "1.10.0" + +[libraries] +junit = { group = "junit", name = "junit", version.ref = "junit" } +ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..65f8a76 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Mar 28 12:01:23 GMT 2026 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..52ca712 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "TextFiction" +include ':app'