diff --git a/.gitignore b/.gitignore index fcc81dd..09b993d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,54 +1,8 @@ -# Copyright: Benjamin Weiss (keyboardsurfer) https://github.com/keyboardsurfer -# Under CC-BY-SA V3.0 (https://creativecommons.org/licenses/by-sa/3.0/legalcode) - -# built application files -*.apk -*.ap_ -#*.jar - -# lint files -lint.xml - -# files for the dex VM -*.dex - -# Java class files -*.class - -# generated files -bin/ -gen/ -classes/ -gen-external-apklibs/ - -# maven output folder -target - -# Local configuration file (sdk path, etc) -local.properties - -# Eclipse project files -.classpath -.project -.metadata -.settings - -# IntelliJ files -.idea *.iml - -# OSX files -.DS_Store - -# Windows files -Thumbs.db - -# vi swap files -*.swp - -# backup files -*.bak - -# Gradle .gradle -build +/local.properties +/.idea +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/android/support/v4/app/Watson.java b/android/support/v4/app/Watson.java deleted file mode 100644 index d93de4c..0000000 --- a/android/support/v4/app/Watson.java +++ /dev/null @@ -1,144 +0,0 @@ -package android.support.v4.app; - -import android.util.Log; -import android.view.View; -import android.view.Window; -import com.actionbarsherlock.ActionBarSherlock.OnCreatePanelMenuListener; -import com.actionbarsherlock.ActionBarSherlock.OnMenuItemSelectedListener; -import com.actionbarsherlock.ActionBarSherlock.OnPreparePanelListener; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuInflater; -import com.actionbarsherlock.view.MenuItem; - -import java.util.ArrayList; - -/** I'm in ur package. Stealing ur variables. */ -public abstract class Watson extends FragmentActivity implements OnCreatePanelMenuListener, OnPreparePanelListener, OnMenuItemSelectedListener { - private static final boolean DEBUG = false; - private static final String TAG = "Watson"; - - /** Fragment interface for menu creation callback. */ - public interface OnCreateOptionsMenuListener { - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater); - } - /** Fragment interface for menu preparation callback. */ - public interface OnPrepareOptionsMenuListener { - public void onPrepareOptionsMenu(Menu menu); - } - /** Fragment interface for menu item selection callback. */ - public interface OnOptionsItemSelectedListener { - public boolean onOptionsItemSelected(MenuItem item); - } - - private ArrayList mCreatedMenus; - - - /////////////////////////////////////////////////////////////////////////// - // Sherlock menu handling - /////////////////////////////////////////////////////////////////////////// - - @Override - public boolean onCreatePanelMenu(int featureId, Menu menu) { - if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu); - - if (featureId == Window.FEATURE_OPTIONS_PANEL) { - boolean result = onCreateOptionsMenu(menu); - if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result); - - MenuInflater inflater = getSupportMenuInflater(); - boolean show = false; - ArrayList newMenus = null; - if (mFragments.mAdded != null) { - for (int i = 0; i < mFragments.mAdded.size(); i++) { - Fragment f = mFragments.mAdded.get(i); - if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnCreateOptionsMenuListener) { - show = true; - ((OnCreateOptionsMenuListener)f).onCreateOptionsMenu(menu, inflater); - if (newMenus == null) { - newMenus = new ArrayList(); - } - newMenus.add(f); - } - } - } - - if (mCreatedMenus != null) { - for (int i = 0; i < mCreatedMenus.size(); i++) { - Fragment f = mCreatedMenus.get(i); - if (newMenus == null || !newMenus.contains(f)) { - f.onDestroyOptionsMenu(); - } - } - } - - mCreatedMenus = newMenus; - - if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show); - result |= show; - - if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result); - return result; - } - return false; - } - - @Override - public boolean onPreparePanel(int featureId, View view, Menu menu) { - if (DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu); - - if (featureId == Window.FEATURE_OPTIONS_PANEL) { - boolean result = onPrepareOptionsMenu(menu); - if (DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result); - - boolean show = false; - if (mFragments.mAdded != null) { - for (int i = 0; i < mFragments.mAdded.size(); i++) { - Fragment f = mFragments.mAdded.get(i); - if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnPrepareOptionsMenuListener) { - show = true; - ((OnPrepareOptionsMenuListener)f).onPrepareOptionsMenu(menu); - } - } - } - - if (DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show); - result |= show; - - result &= menu.hasVisibleItems(); - if (DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result); - return result; - } - return false; - } - - @Override - public boolean onMenuItemSelected(int featureId, MenuItem item) { - if (DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item); - - if (featureId == Window.FEATURE_OPTIONS_PANEL) { - if (onOptionsItemSelected(item)) { - return true; - } - - if (mFragments.mAdded != null) { - for (int i = 0; i < mFragments.mAdded.size(); i++) { - Fragment f = mFragments.mAdded.get(i); - if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnOptionsItemSelectedListener) { - if (((OnOptionsItemSelectedListener)f).onOptionsItemSelected(item)) { - return true; - } - } - } - } - } - return false; - } - - public abstract boolean onCreateOptionsMenu(Menu menu); - - public abstract boolean onPrepareOptionsMenu(Menu menu); - - public abstract boolean onOptionsItemSelected(MenuItem item); - - public abstract MenuInflater getSupportMenuInflater(); -} diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/src/withGCM/java/org/c_base/c_beam/build.gradle b/app/build.gradle similarity index 60% rename from src/withGCM/java/org/c_base/c_beam/build.gradle rename to app/build.gradle index b78c9d9..3f2b2a3 100644 --- a/src/withGCM/java/org/c_base/c_beam/build.gradle +++ b/app/build.gradle @@ -1,28 +1,25 @@ -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' - } -} - apply plugin: 'com.android.application' -repositories { - mavenCentral() -} - android { - compileSdkVersion 23 - buildToolsVersion '25.0.2' - - lintOptions { - checkReleaseBuilds false - // Or, if you prefer, you can continue to check for errors in release builds, - // but continue the build even when errors are found: - abortOnError false + compileSdkVersion 22 + buildToolsVersion '28.0.3' + defaultConfig { + applicationId "org.c_base.c_beam" + minSdkVersion 9 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } flavorDimensions "gcm" @@ -35,15 +32,12 @@ android { noGCM { dimension "gcm" } - } - } - dependencies { compile 'com.androidplot:androidplot-core:0.6.1' - compile 'com.android.support:support-v4:20.0.0' + compile 'com.android.support:support-v4:22.2.1' compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' compile 'com.mcxiaoke.viewpagerindicator:library:2.4.1@aar' compile 'com.madgag.spongycastle:core:1.51.0.0' @@ -57,4 +51,4 @@ dependencies { } compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:latest.integration' withGCMCompile fileTree(dir: 'libs', include: '*.jar') -} \ No newline at end of file +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /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 diff --git a/app/src/androidTest/java/org/c_base/c_beam/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/c_base/c_beam/ExampleInstrumentedTest.java new file mode 100644 index 0000000..17e1a97 --- /dev/null +++ b/app/src/androidTest/java/org/c_base/c_beam/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package org.c_base.c_beam; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("org.c_base.c_beam", appContext.getPackageName()); + } +} diff --git a/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 98% rename from src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index f72e6de..17b71e1 100644 --- a/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,6 @@ - - + package="org.c_base.c_beam"> diff --git a/src/main/assets/CEVA-CM.TTF b/app/src/main/assets/CEVA-CM.TTF similarity index 100% rename from src/main/assets/CEVA-CM.TTF rename to app/src/main/assets/CEVA-CM.TTF diff --git a/src/main/assets/X-SCALE.TTF b/app/src/main/assets/X-SCALE.TTF similarity index 100% rename from src/main/assets/X-SCALE.TTF rename to app/src/main/assets/X-SCALE.TTF diff --git a/assets/drawable-src/button_32x32_orig.xcf b/app/src/main/assets/drawable-src/button_32x32_orig.xcf similarity index 100% rename from assets/drawable-src/button_32x32_orig.xcf rename to app/src/main/assets/drawable-src/button_32x32_orig.xcf diff --git a/assets/drawable-src/button_32x32_round.xcf b/app/src/main/assets/drawable-src/button_32x32_round.xcf similarity index 100% rename from assets/drawable-src/button_32x32_round.xcf rename to app/src/main/assets/drawable-src/button_32x32_round.xcf diff --git a/assets/drawable-src/button_orig.xcf b/app/src/main/assets/drawable-src/button_orig.xcf similarity index 100% rename from assets/drawable-src/button_orig.xcf rename to app/src/main/assets/drawable-src/button_orig.xcf diff --git a/assets/drawable-src/button_orig_np.xcf b/app/src/main/assets/drawable-src/button_orig_np.xcf similarity index 100% rename from assets/drawable-src/button_orig_np.xcf rename to app/src/main/assets/drawable-src/button_orig_np.xcf diff --git a/assets/drawable-src/button_orig_smaller.xcf b/app/src/main/assets/drawable-src/button_orig_smaller.xcf similarity index 100% rename from assets/drawable-src/button_orig_smaller.xcf rename to app/src/main/assets/drawable-src/button_orig_smaller.xcf diff --git a/assets/drawable-src/listitembg_orig.xcf b/app/src/main/assets/drawable-src/listitembg_orig.xcf similarity index 100% rename from assets/drawable-src/listitembg_orig.xcf rename to app/src/main/assets/drawable-src/listitembg_orig.xcf diff --git a/src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java b/app/src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java similarity index 98% rename from src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java rename to app/src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java index dd9d391..54fad54 100644 --- a/src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java +++ b/app/src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java @@ -29,7 +29,7 @@ */ public class C_beamAppWidgetProvider extends AppWidgetProvider { // log tag - private static final String TAG = "ExampleAppWidgetProvider"; + private static final String TAG = "CBeamAppWidgetProvider"; @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { diff --git a/src/main/java/org/c_base/c_beam/CbeamApplication.java b/app/src/main/java/org/c_base/c_beam/CbeamApplication.java similarity index 100% rename from src/main/java/org/c_base/c_beam/CbeamApplication.java rename to app/src/main/java/org/c_base/c_beam/CbeamApplication.java diff --git a/src/main/java/org/c_base/c_beam/NotificationBroadcastReceiver.java b/app/src/main/java/org/c_base/c_beam/NotificationBroadcastReceiver.java similarity index 100% rename from src/main/java/org/c_base/c_beam/NotificationBroadcastReceiver.java rename to app/src/main/java/org/c_base/c_beam/NotificationBroadcastReceiver.java diff --git a/src/main/java/org/c_base/c_beam/Settings.java b/app/src/main/java/org/c_base/c_beam/Settings.java similarity index 100% rename from src/main/java/org/c_base/c_beam/Settings.java rename to app/src/main/java/org/c_base/c_beam/Settings.java diff --git a/src/main/java/org/c_base/c_beam/activity/AppWidgetConfigure.java b/app/src/main/java/org/c_base/c_beam/activity/AppWidgetConfigure.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/AppWidgetConfigure.java rename to app/src/main/java/org/c_base/c_beam/activity/AppWidgetConfigure.java diff --git a/src/main/java/org/c_base/c_beam/activity/ArtefactActivity.java b/app/src/main/java/org/c_base/c_beam/activity/ArtefactActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/ArtefactActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/ArtefactActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/BamActivity.java b/app/src/main/java/org/c_base/c_beam/activity/BamActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/BamActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/BamActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/C_PortalActivity.java b/app/src/main/java/org/c_base/c_beam/activity/C_PortalActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/C_PortalActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/C_PortalActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/C_beamActivity.java b/app/src/main/java/org/c_base/c_beam/activity/C_beamActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/C_beamActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/C_beamActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/C_outActivity.java b/app/src/main/java/org/c_base/c_beam/activity/C_outActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/C_outActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/C_outActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/CarbonActivity.java b/app/src/main/java/org/c_base/c_beam/activity/CarbonActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/CarbonActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/CarbonActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/CcorderActivity.java b/app/src/main/java/org/c_base/c_beam/activity/CcorderActivity.java similarity index 95% rename from src/main/java/org/c_base/c_beam/activity/CcorderActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/CcorderActivity.java index fcee237..87c2642 100644 --- a/src/main/java/org/c_base/c_beam/activity/CcorderActivity.java +++ b/app/src/main/java/org/c_base/c_beam/activity/CcorderActivity.java @@ -24,6 +24,7 @@ import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.widget.DrawerLayout; import android.text.Html; +import android.util.Log; import android.view.Gravity; import android.view.MotionEvent; import android.view.SurfaceHolder; @@ -443,20 +444,28 @@ void ledOn() { // if(mSurfaceView.getVisibility() != View.VISIBLE) { // camera = Camera.open(); // } - Parameters params = camera.getParameters(); - params.setFlashMode(Parameters.FLASH_MODE_TORCH); - camera.setParameters(params); + try { + Parameters params = camera.getParameters(); + params.setFlashMode(Parameters.FLASH_MODE_TORCH); + camera.setParameters(params); + } catch (Exception ex) { + Log.e(TAG, "TODO camera permission", ex); + } //Log.d(TAG, "ledOn " + System.currentTimeMillis()); } void ledOff() { - Parameters params = camera.getParameters(); - params.setFlashMode(Parameters.FLASH_MODE_OFF); - camera.setParameters(params); -// if(mSurfaceView.getVisibility() != View.VISIBLE) { -// camera.release(); -// } - //Log.d(TAG, "ledOff" + System.currentTimeMillis()); + try { + Parameters params = camera.getParameters(); + params.setFlashMode(Parameters.FLASH_MODE_OFF); + camera.setParameters(params); +// if(mSurfaceView.getVisibility() != View.VISIBLE) { +// camera.release(); +// } + //Log.d(TAG, "ledOff" + System.currentTimeMillis()); + } catch (Exception ex) { + Log.e(TAG, "TODO camera permission", ex); + } } void ledflash() { @@ -527,7 +536,11 @@ protected void onResume() { // if (toggleButtonScanner.isChecked() || toggleButtonSensors.isChecked()) registerSensors(); startTimerForSlowPlots(); - camera = Camera.open(); + try { + camera = Camera.open(); + } catch (Exception ex) { + Log.e(TAG, "TODO camera permission", ex); + } } private void startTimerForSlowPlots() { @@ -543,9 +556,13 @@ private void registerSensors() { protected void onPause() { super.onPause(); unregisterSensors(); - camera.stopPreview(); - camera.release(); - camera = null; + try { + camera.stopPreview(); + camera.release(); + camera = null; + } catch (Exception ex) { + Log.e(TAG, "TODO camera permission", ex); + } handler.removeCallbacks(updateSlowPlotsCallbacks); } diff --git a/src/main/java/org/c_base/c_beam/activity/CienceActivity.java b/app/src/main/java/org/c_base/c_beam/activity/CienceActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/CienceActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/CienceActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/ClampActivity.java b/app/src/main/java/org/c_base/c_beam/activity/ClampActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/ClampActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/ClampActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/ComActivity.java b/app/src/main/java/org/c_base/c_beam/activity/ComActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/ComActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/ComActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/CoreActivity.java b/app/src/main/java/org/c_base/c_beam/activity/CoreActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/CoreActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/CoreActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/CreactivActivity.java b/app/src/main/java/org/c_base/c_beam/activity/CreactivActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/CreactivActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/CreactivActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/CultureActivity.java b/app/src/main/java/org/c_base/c_beam/activity/CultureActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/CultureActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/CultureActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/EventActivity.java b/app/src/main/java/org/c_base/c_beam/activity/EventActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/EventActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/EventActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/MainActivity.java b/app/src/main/java/org/c_base/c_beam/activity/MainActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/MainActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/MainActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/MapActivity.java b/app/src/main/java/org/c_base/c_beam/activity/MapActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/MapActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/MapActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/MissionActivity.java b/app/src/main/java/org/c_base/c_beam/activity/MissionActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/MissionActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/MissionActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/MissionDetailActivity.java b/app/src/main/java/org/c_base/c_beam/activity/MissionDetailActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/MissionDetailActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/MissionDetailActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/NotificationActivity.java b/app/src/main/java/org/c_base/c_beam/activity/NotificationActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/NotificationActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/NotificationActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/RingActivity.java b/app/src/main/java/org/c_base/c_beam/activity/RingActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/RingActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/RingActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/SettingsActivity.java b/app/src/main/java/org/c_base/c_beam/activity/SettingsActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/SettingsActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/SettingsActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/UserActivity.java b/app/src/main/java/org/c_base/c_beam/activity/UserActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/UserActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/UserActivity.java diff --git a/src/main/java/org/c_base/c_beam/activity/WebActivity.java b/app/src/main/java/org/c_base/c_beam/activity/WebActivity.java similarity index 100% rename from src/main/java/org/c_base/c_beam/activity/WebActivity.java rename to app/src/main/java/org/c_base/c_beam/activity/WebActivity.java diff --git a/src/main/java/org/c_base/c_beam/adapter/ViewPagerAdapter.java b/app/src/main/java/org/c_base/c_beam/adapter/ViewPagerAdapter.java similarity index 100% rename from src/main/java/org/c_base/c_beam/adapter/ViewPagerAdapter.java rename to app/src/main/java/org/c_base/c_beam/adapter/ViewPagerAdapter.java diff --git a/src/main/java/org/c_base/c_beam/boot/BootReceiver.java b/app/src/main/java/org/c_base/c_beam/boot/BootReceiver.java similarity index 100% rename from src/main/java/org/c_base/c_beam/boot/BootReceiver.java rename to app/src/main/java/org/c_base/c_beam/boot/BootReceiver.java diff --git a/src/main/java/org/c_base/c_beam/ccorder/DrawOnTop.java b/app/src/main/java/org/c_base/c_beam/ccorder/DrawOnTop.java similarity index 100% rename from src/main/java/org/c_base/c_beam/ccorder/DrawOnTop.java rename to app/src/main/java/org/c_base/c_beam/ccorder/DrawOnTop.java diff --git a/src/main/java/org/c_base/c_beam/ccorder/Scanbar.java b/app/src/main/java/org/c_base/c_beam/ccorder/Scanbar.java similarity index 100% rename from src/main/java/org/c_base/c_beam/ccorder/Scanbar.java rename to app/src/main/java/org/c_base/c_beam/ccorder/Scanbar.java diff --git a/src/main/java/org/c_base/c_beam/ccorder/SensorPlot.java b/app/src/main/java/org/c_base/c_beam/ccorder/SensorPlot.java similarity index 100% rename from src/main/java/org/c_base/c_beam/ccorder/SensorPlot.java rename to app/src/main/java/org/c_base/c_beam/ccorder/SensorPlot.java diff --git a/src/main/java/org/c_base/c_beam/ccorder/TouchSurfaceView.java b/app/src/main/java/org/c_base/c_beam/ccorder/TouchSurfaceView.java similarity index 100% rename from src/main/java/org/c_base/c_beam/ccorder/TouchSurfaceView.java rename to app/src/main/java/org/c_base/c_beam/ccorder/TouchSurfaceView.java diff --git a/src/main/java/org/c_base/c_beam/domain/ActivityLog.java b/app/src/main/java/org/c_base/c_beam/domain/ActivityLog.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/ActivityLog.java rename to app/src/main/java/org/c_base/c_beam/domain/ActivityLog.java diff --git a/src/main/java/org/c_base/c_beam/domain/Artefact.java b/app/src/main/java/org/c_base/c_beam/domain/Artefact.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/Artefact.java rename to app/src/main/java/org/c_base/c_beam/domain/Artefact.java diff --git a/src/main/java/org/c_base/c_beam/domain/Article.java b/app/src/main/java/org/c_base/c_beam/domain/Article.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/Article.java rename to app/src/main/java/org/c_base/c_beam/domain/Article.java diff --git a/src/main/java/org/c_base/c_beam/domain/C_beam.java b/app/src/main/java/org/c_base/c_beam/domain/C_beam.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/C_beam.java rename to app/src/main/java/org/c_base/c_beam/domain/C_beam.java diff --git a/src/main/java/org/c_base/c_beam/domain/Event.java b/app/src/main/java/org/c_base/c_beam/domain/Event.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/Event.java rename to app/src/main/java/org/c_base/c_beam/domain/Event.java diff --git a/src/main/java/org/c_base/c_beam/domain/Mission.java b/app/src/main/java/org/c_base/c_beam/domain/Mission.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/Mission.java rename to app/src/main/java/org/c_base/c_beam/domain/Mission.java diff --git a/src/main/java/org/c_base/c_beam/domain/Notification.java b/app/src/main/java/org/c_base/c_beam/domain/Notification.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/Notification.java rename to app/src/main/java/org/c_base/c_beam/domain/Notification.java diff --git a/src/main/java/org/c_base/c_beam/domain/Ring.java b/app/src/main/java/org/c_base/c_beam/domain/Ring.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/Ring.java rename to app/src/main/java/org/c_base/c_beam/domain/Ring.java diff --git a/src/main/java/org/c_base/c_beam/domain/User.java b/app/src/main/java/org/c_base/c_beam/domain/User.java similarity index 100% rename from src/main/java/org/c_base/c_beam/domain/User.java rename to app/src/main/java/org/c_base/c_beam/domain/User.java diff --git a/src/main/java/org/c_base/c_beam/extension/NotificationBroadcast.java b/app/src/main/java/org/c_base/c_beam/extension/NotificationBroadcast.java similarity index 100% rename from src/main/java/org/c_base/c_beam/extension/NotificationBroadcast.java rename to app/src/main/java/org/c_base/c_beam/extension/NotificationBroadcast.java diff --git a/src/main/java/org/c_base/c_beam/fragment/AboutDialogFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/AboutDialogFragment.java similarity index 70% rename from src/main/java/org/c_base/c_beam/fragment/AboutDialogFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/AboutDialogFragment.java index 06fda74..378ee2a 100644 --- a/src/main/java/org/c_base/c_beam/fragment/AboutDialogFragment.java +++ b/app/src/main/java/org/c_base/c_beam/fragment/AboutDialogFragment.java @@ -1,13 +1,11 @@ package org.c_base.c_beam.fragment; +import org.c_base.c_beam.BuildConfig; import org.c_base.c_beam.R; -import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.text.Html; @@ -40,15 +38,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { } private String getVersionName() { - String version = "?"; - try { - Activity context = getActivity(); - String packageName = context.getPackageName(); - PackageInfo pi = context.getPackageManager().getPackageInfo(packageName, 0); - version = pi.versionName; - } catch (PackageManager.NameNotFoundException e) { - // do nothing + if ("debug".equals(BuildConfig.BUILD_TYPE)) { + return String.format("%s (%d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE); } - return version; + return BuildConfig.VERSION_NAME; } } diff --git a/src/main/java/org/c_base/c_beam/fragment/ActivitylogFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/ActivitylogFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/ActivitylogFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/ActivitylogFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/ArrayListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/ArrayListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/ArrayListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/ArrayListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/ArtefactListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/ArtefactListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/ArtefactListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/ArtefactListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/C_ontrolFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/C_ontrolFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/C_ontrolFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/C_ontrolFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/C_outListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/C_outListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/C_outListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/C_outListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/C_portalListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/C_portalListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/C_portalListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/C_portalListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/C_portalWebViewFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/C_portalWebViewFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/C_portalWebViewFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/C_portalWebViewFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/EventListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/EventListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/EventListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/EventListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/MainButtonFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/MainButtonFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/MainButtonFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/MainButtonFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/MissionDetailFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/MissionDetailFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/MissionDetailFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/MissionDetailFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/MissionListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/MissionListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/MissionListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/MissionListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/NotificationListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/NotificationListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/NotificationListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/NotificationListFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/RingButtonFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/RingButtonFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/RingButtonFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/RingButtonFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/RinginfoFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/RinginfoFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/RinginfoFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/RinginfoFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/StatsFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/StatsFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/StatsFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/StatsFragment.java diff --git a/src/main/java/org/c_base/c_beam/fragment/UserListFragment.java b/app/src/main/java/org/c_base/c_beam/fragment/UserListFragment.java similarity index 100% rename from src/main/java/org/c_base/c_beam/fragment/UserListFragment.java rename to app/src/main/java/org/c_base/c_beam/fragment/UserListFragment.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/ActivityConstants.java b/app/src/main/java/org/c_base/c_beam/mqtt/ActivityConstants.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/ActivityConstants.java rename to app/src/main/java/org/c_base/c_beam/mqtt/ActivityConstants.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/Connection.java b/app/src/main/java/org/c_base/c_beam/mqtt/Connection.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/Connection.java rename to app/src/main/java/org/c_base/c_beam/mqtt/Connection.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/Connections.java b/app/src/main/java/org/c_base/c_beam/mqtt/Connections.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/Connections.java rename to app/src/main/java/org/c_base/c_beam/mqtt/Connections.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/MqttCallbackHandler.java b/app/src/main/java/org/c_base/c_beam/mqtt/MqttCallbackHandler.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/MqttCallbackHandler.java rename to app/src/main/java/org/c_base/c_beam/mqtt/MqttCallbackHandler.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/MqttManager.java b/app/src/main/java/org/c_base/c_beam/mqtt/MqttManager.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/MqttManager.java rename to app/src/main/java/org/c_base/c_beam/mqtt/MqttManager.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/NetworkBroadcastReceiver.java b/app/src/main/java/org/c_base/c_beam/mqtt/NetworkBroadcastReceiver.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/NetworkBroadcastReceiver.java rename to app/src/main/java/org/c_base/c_beam/mqtt/NetworkBroadcastReceiver.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/Notify.java b/app/src/main/java/org/c_base/c_beam/mqtt/Notify.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/Notify.java rename to app/src/main/java/org/c_base/c_beam/mqtt/Notify.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/Persistence.java b/app/src/main/java/org/c_base/c_beam/mqtt/Persistence.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/Persistence.java rename to app/src/main/java/org/c_base/c_beam/mqtt/Persistence.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/PersistenceException.java b/app/src/main/java/org/c_base/c_beam/mqtt/PersistenceException.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/PersistenceException.java rename to app/src/main/java/org/c_base/c_beam/mqtt/PersistenceException.java diff --git a/src/main/java/org/c_base/c_beam/mqtt/SslUtil.java b/app/src/main/java/org/c_base/c_beam/mqtt/SslUtil.java similarity index 100% rename from src/main/java/org/c_base/c_beam/mqtt/SslUtil.java rename to app/src/main/java/org/c_base/c_beam/mqtt/SslUtil.java diff --git a/src/main/java/org/c_base/c_beam/receiver/C_beamBroadcastReceiver.java b/app/src/main/java/org/c_base/c_beam/receiver/C_beamBroadcastReceiver.java similarity index 100% rename from src/main/java/org/c_base/c_beam/receiver/C_beamBroadcastReceiver.java rename to app/src/main/java/org/c_base/c_beam/receiver/C_beamBroadcastReceiver.java diff --git a/src/main/java/org/c_base/c_beam/receiver/GCMBroadcastReceiver.java b/app/src/main/java/org/c_base/c_beam/receiver/GCMBroadcastReceiver.java similarity index 100% rename from src/main/java/org/c_base/c_beam/receiver/GCMBroadcastReceiver.java rename to app/src/main/java/org/c_base/c_beam/receiver/GCMBroadcastReceiver.java diff --git a/src/main/java/org/c_base/c_beam/service/C_beamService.java b/app/src/main/java/org/c_base/c_beam/service/C_beamService.java similarity index 100% rename from src/main/java/org/c_base/c_beam/service/C_beamService.java rename to app/src/main/java/org/c_base/c_beam/service/C_beamService.java diff --git a/src/main/java/org/c_base/c_beam/settings/Settings.java b/app/src/main/java/org/c_base/c_beam/settings/Settings.java similarity index 100% rename from src/main/java/org/c_base/c_beam/settings/Settings.java rename to app/src/main/java/org/c_base/c_beam/settings/Settings.java diff --git a/src/main/java/org/c_base/c_beam/util/BooleanLock.java b/app/src/main/java/org/c_base/c_beam/util/BooleanLock.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/BooleanLock.java rename to app/src/main/java/org/c_base/c_beam/util/BooleanLock.java diff --git a/src/main/java/org/c_base/c_beam/util/CamLayer.java b/app/src/main/java/org/c_base/c_beam/util/CamLayer.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/CamLayer.java rename to app/src/main/java/org/c_base/c_beam/util/CamLayer.java diff --git a/src/main/java/org/c_base/c_beam/util/CubeRenderer.java b/app/src/main/java/org/c_base/c_beam/util/CubeRenderer.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/CubeRenderer.java rename to app/src/main/java/org/c_base/c_beam/util/CubeRenderer.java diff --git a/src/main/java/org/c_base/c_beam/util/GLLayer.java b/app/src/main/java/org/c_base/c_beam/util/GLLayer.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/GLLayer.java rename to app/src/main/java/org/c_base/c_beam/util/GLLayer.java diff --git a/src/main/java/org/c_base/c_beam/util/Helper.java b/app/src/main/java/org/c_base/c_beam/util/Helper.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/Helper.java rename to app/src/main/java/org/c_base/c_beam/util/Helper.java diff --git a/src/main/java/org/c_base/c_beam/util/NotificationsDataSource.java b/app/src/main/java/org/c_base/c_beam/util/NotificationsDataSource.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/NotificationsDataSource.java rename to app/src/main/java/org/c_base/c_beam/util/NotificationsDataSource.java diff --git a/src/main/java/org/c_base/c_beam/util/Preview.java b/app/src/main/java/org/c_base/c_beam/util/Preview.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/Preview.java rename to app/src/main/java/org/c_base/c_beam/util/Preview.java diff --git a/src/main/java/org/c_base/c_beam/util/SQLiteHelper.java b/app/src/main/java/org/c_base/c_beam/util/SQLiteHelper.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/SQLiteHelper.java rename to app/src/main/java/org/c_base/c_beam/util/SQLiteHelper.java diff --git a/src/main/java/org/c_base/c_beam/util/ScrollState.java b/app/src/main/java/org/c_base/c_beam/util/ScrollState.java similarity index 100% rename from src/main/java/org/c_base/c_beam/util/ScrollState.java rename to app/src/main/java/org/c_base/c_beam/util/ScrollState.java diff --git a/src/main/java/org/c_base/c_beam/view/CameraPreview.java b/app/src/main/java/org/c_base/c_beam/view/CameraPreview.java similarity index 100% rename from src/main/java/org/c_base/c_beam/view/CameraPreview.java rename to app/src/main/java/org/c_base/c_beam/view/CameraPreview.java diff --git a/src/main/java/org/c_base/c_beam/view/NonSwipeableViewPager.java b/app/src/main/java/org/c_base/c_beam/view/NonSwipeableViewPager.java similarity index 100% rename from src/main/java/org/c_base/c_beam/view/NonSwipeableViewPager.java rename to app/src/main/java/org/c_base/c_beam/view/NonSwipeableViewPager.java diff --git a/src/main/res/drawable-hdpi/button.xml b/app/src/main/res/drawable-hdpi/button.xml similarity index 100% rename from src/main/res/drawable-hdpi/button.xml rename to app/src/main/res/drawable-hdpi/button.xml diff --git a/src/main/res/drawable-hdpi/ccorder.png b/app/src/main/res/drawable-hdpi/ccorder.png similarity index 100% rename from src/main/res/drawable-hdpi/ccorder.png rename to app/src/main/res/drawable-hdpi/ccorder.png diff --git a/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_drawer.png rename to app/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/src/main/res/drawable-hdpi/ic_launcher_c_beam_online.png b/app/src/main/res/drawable-hdpi/ic_launcher_c_beam_online.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_launcher_c_beam_online.png rename to app/src/main/res/drawable-hdpi/ic_launcher_c_beam_online.png diff --git a/src/main/res/drawable-hdpi/npatch160dpi.9.png b/app/src/main/res/drawable-hdpi/npatch160dpi.9.png similarity index 100% rename from src/main/res/drawable-hdpi/npatch160dpi.9.png rename to app/src/main/res/drawable-hdpi/npatch160dpi.9.png diff --git a/src/main/res/drawable-hdpi/scanner.png b/app/src/main/res/drawable-hdpi/scanner.png similarity index 100% rename from src/main/res/drawable-hdpi/scanner.png rename to app/src/main/res/drawable-hdpi/scanner.png diff --git a/src/main/res/drawable-hdpi/smlnpatch240dpi.9.png b/app/src/main/res/drawable-hdpi/smlnpatch240dpi.9.png similarity index 100% rename from src/main/res/drawable-hdpi/smlnpatch240dpi.9.png rename to app/src/main/res/drawable-hdpi/smlnpatch240dpi.9.png diff --git a/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from src/main/res/drawable-ldpi/ic_launcher.png rename to app/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/src/main/res/drawable-ldpi/ic_launcher_c_beam_online.png b/app/src/main/res/drawable-ldpi/ic_launcher_c_beam_online.png similarity index 100% rename from src/main/res/drawable-ldpi/ic_launcher_c_beam_online.png rename to app/src/main/res/drawable-ldpi/ic_launcher_c_beam_online.png diff --git a/src/main/res/drawable-mdpi/bg.jpg b/app/src/main/res/drawable-mdpi/bg.jpg similarity index 100% rename from src/main/res/drawable-mdpi/bg.jpg rename to app/src/main/res/drawable-mdpi/bg.jpg diff --git a/src/main/res/drawable-mdpi/bg_portrait.jpg b/app/src/main/res/drawable-mdpi/bg_portrait.jpg similarity index 100% rename from src/main/res/drawable-mdpi/bg_portrait.jpg rename to app/src/main/res/drawable-mdpi/bg_portrait.jpg diff --git a/src/main/res/drawable-mdpi/bg_small.png b/app/src/main/res/drawable-mdpi/bg_small.png similarity index 100% rename from src/main/res/drawable-mdpi/bg_small.png rename to app/src/main/res/drawable-mdpi/bg_small.png diff --git a/src/main/res/drawable-mdpi/button_32x32_black.9.png b/app/src/main/res/drawable-mdpi/button_32x32_black.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_32x32_black.9.png rename to app/src/main/res/drawable-mdpi/button_32x32_black.9.png diff --git a/src/main/res/drawable-mdpi/button_32x32_dark.9.png b/app/src/main/res/drawable-mdpi/button_32x32_dark.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_32x32_dark.9.png rename to app/src/main/res/drawable-mdpi/button_32x32_dark.9.png diff --git a/src/main/res/drawable-mdpi/button_32x32_darker.9.png b/app/src/main/res/drawable-mdpi/button_32x32_darker.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_32x32_darker.9.png rename to app/src/main/res/drawable-mdpi/button_32x32_darker.9.png diff --git a/src/main/res/drawable-mdpi/button_32x32_gray.9.png b/app/src/main/res/drawable-mdpi/button_32x32_gray.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_32x32_gray.9.png rename to app/src/main/res/drawable-mdpi/button_32x32_gray.9.png diff --git a/src/main/res/drawable-mdpi/button_32x32_light.9.png b/app/src/main/res/drawable-mdpi/button_32x32_light.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_32x32_light.9.png rename to app/src/main/res/drawable-mdpi/button_32x32_light.9.png diff --git a/src/main/res/drawable-mdpi/button_32x32_med.9.png b/app/src/main/res/drawable-mdpi/button_32x32_med.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_32x32_med.9.png rename to app/src/main/res/drawable-mdpi/button_32x32_med.9.png diff --git a/src/main/res/drawable-mdpi/button_blue_dark.png b/app/src/main/res/drawable-mdpi/button_blue_dark.png similarity index 100% rename from src/main/res/drawable-mdpi/button_blue_dark.png rename to app/src/main/res/drawable-mdpi/button_blue_dark.png diff --git a/src/main/res/drawable-mdpi/button_blue_light.png b/app/src/main/res/drawable-mdpi/button_blue_light.png similarity index 100% rename from src/main/res/drawable-mdpi/button_blue_light.png rename to app/src/main/res/drawable-mdpi/button_blue_light.png diff --git a/src/main/res/drawable-mdpi/button_dark.9.png b/app/src/main/res/drawable-mdpi/button_dark.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_dark.9.png rename to app/src/main/res/drawable-mdpi/button_dark.9.png diff --git a/src/main/res/drawable-mdpi/button_light.9.png b/app/src/main/res/drawable-mdpi/button_light.9.png similarity index 100% rename from src/main/res/drawable-mdpi/button_light.9.png rename to app/src/main/res/drawable-mdpi/button_light.9.png diff --git a/src/main/res/drawable-mdpi/button_normal.png b/app/src/main/res/drawable-mdpi/button_normal.png similarity index 100% rename from src/main/res/drawable-mdpi/button_normal.png rename to app/src/main/res/drawable-mdpi/button_normal.png diff --git a/src/main/res/drawable-mdpi/button_pressed.png b/app/src/main/res/drawable-mdpi/button_pressed.png similarity index 100% rename from src/main/res/drawable-mdpi/button_pressed.png rename to app/src/main/res/drawable-mdpi/button_pressed.png diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/src/main/res/drawable-mdpi/ic_launcher_c_beam_online.png b/app/src/main/res/drawable-mdpi/ic_launcher_c_beam_online.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_launcher_c_beam_online.png rename to app/src/main/res/drawable-mdpi/ic_launcher_c_beam_online.png diff --git a/src/main/res/drawable-mdpi/listitembg.png b/app/src/main/res/drawable-mdpi/listitembg.png similarity index 100% rename from src/main/res/drawable-mdpi/listitembg.png rename to app/src/main/res/drawable-mdpi/listitembg.png diff --git a/src/main/res/drawable-mdpi/ring_carbon.png b/app/src/main/res/drawable-mdpi/ring_carbon.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_carbon.png rename to app/src/main/res/drawable-mdpi/ring_carbon.png diff --git a/src/main/res/drawable-mdpi/ring_cience.png b/app/src/main/res/drawable-mdpi/ring_cience.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_cience.png rename to app/src/main/res/drawable-mdpi/ring_cience.png diff --git a/src/main/res/drawable-mdpi/ring_clamp.png b/app/src/main/res/drawable-mdpi/ring_clamp.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_clamp.png rename to app/src/main/res/drawable-mdpi/ring_clamp.png diff --git a/src/main/res/drawable-mdpi/ring_com.png b/app/src/main/res/drawable-mdpi/ring_com.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_com.png rename to app/src/main/res/drawable-mdpi/ring_com.png diff --git a/src/main/res/drawable-mdpi/ring_core.png b/app/src/main/res/drawable-mdpi/ring_core.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_core.png rename to app/src/main/res/drawable-mdpi/ring_core.png diff --git a/src/main/res/drawable-mdpi/ring_creactiv.png b/app/src/main/res/drawable-mdpi/ring_creactiv.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_creactiv.png rename to app/src/main/res/drawable-mdpi/ring_creactiv.png diff --git a/src/main/res/drawable-mdpi/ring_culture.png b/app/src/main/res/drawable-mdpi/ring_culture.png similarity index 100% rename from src/main/res/drawable-mdpi/ring_culture.png rename to app/src/main/res/drawable-mdpi/ring_culture.png diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xhdpi/ic_launcher_c_beam_online.png b/app/src/main/res/drawable-xhdpi/ic_launcher_c_beam_online.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_launcher_c_beam_online.png rename to app/src/main/res/drawable-xhdpi/ic_launcher_c_beam_online.png diff --git a/src/main/res/layout/about_dialog.xml b/app/src/main/res/layout/about_dialog.xml similarity index 100% rename from src/main/res/layout/about_dialog.xml rename to app/src/main/res/layout/about_dialog.xml diff --git a/src/main/res/layout/activity_artefact.xml b/app/src/main/res/layout/activity_artefact.xml similarity index 100% rename from src/main/res/layout/activity_artefact.xml rename to app/src/main/res/layout/activity_artefact.xml diff --git a/src/main/res/layout/activity_bam.xml b/app/src/main/res/layout/activity_bam.xml similarity index 100% rename from src/main/res/layout/activity_bam.xml rename to app/src/main/res/layout/activity_bam.xml diff --git a/src/main/res/layout/activity_c_out.xml b/app/src/main/res/layout/activity_c_out.xml similarity index 100% rename from src/main/res/layout/activity_c_out.xml rename to app/src/main/res/layout/activity_c_out.xml diff --git a/src/main/res/layout/activity_c_portal.xml b/app/src/main/res/layout/activity_c_portal.xml similarity index 100% rename from src/main/res/layout/activity_c_portal.xml rename to app/src/main/res/layout/activity_c_portal.xml diff --git a/src/main/res/layout/activity_ccorder.xml b/app/src/main/res/layout/activity_ccorder.xml similarity index 100% rename from src/main/res/layout/activity_ccorder.xml rename to app/src/main/res/layout/activity_ccorder.xml diff --git a/src/main/res/layout/activity_creactiv.xml b/app/src/main/res/layout/activity_creactiv.xml similarity index 100% rename from src/main/res/layout/activity_creactiv.xml rename to app/src/main/res/layout/activity_creactiv.xml diff --git a/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml similarity index 100% rename from src/main/res/layout/activity_event.xml rename to app/src/main/res/layout/activity_event.xml diff --git a/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml similarity index 100% rename from src/main/res/layout/activity_map.xml rename to app/src/main/res/layout/activity_map.xml diff --git a/src/main/res/layout/activity_mission.xml b/app/src/main/res/layout/activity_mission.xml similarity index 100% rename from src/main/res/layout/activity_mission.xml rename to app/src/main/res/layout/activity_mission.xml diff --git a/src/main/res/layout/activity_mission_detail.xml b/app/src/main/res/layout/activity_mission_detail.xml similarity index 100% rename from src/main/res/layout/activity_mission_detail.xml rename to app/src/main/res/layout/activity_mission_detail.xml diff --git a/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml similarity index 100% rename from src/main/res/layout/activity_notification.xml rename to app/src/main/res/layout/activity_notification.xml diff --git a/src/main/res/layout/activity_ring.xml b/app/src/main/res/layout/activity_ring.xml similarity index 100% rename from src/main/res/layout/activity_ring.xml rename to app/src/main/res/layout/activity_ring.xml diff --git a/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml similarity index 100% rename from src/main/res/layout/activity_user.xml rename to app/src/main/res/layout/activity_user.xml diff --git a/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml similarity index 100% rename from src/main/res/layout/activity_web.xml rename to app/src/main/res/layout/activity_web.xml diff --git a/src/main/res/layout/appwidget_provider.xml b/app/src/main/res/layout/appwidget_provider.xml similarity index 100% rename from src/main/res/layout/appwidget_provider.xml rename to app/src/main/res/layout/appwidget_provider.xml diff --git a/src/main/res/layout/c_beam_appwidget.xml b/app/src/main/res/layout/c_beam_appwidget.xml similarity index 100% rename from src/main/res/layout/c_beam_appwidget.xml rename to app/src/main/res/layout/c_beam_appwidget.xml diff --git a/src/main/res/layout/c_beam_keyguard.xml b/app/src/main/res/layout/c_beam_keyguard.xml similarity index 100% rename from src/main/res/layout/c_beam_keyguard.xml rename to app/src/main/res/layout/c_beam_keyguard.xml diff --git a/src/main/res/layout/dialog_c_out.xml b/app/src/main/res/layout/dialog_c_out.xml similarity index 100% rename from src/main/res/layout/dialog_c_out.xml rename to app/src/main/res/layout/dialog_c_out.xml diff --git a/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml similarity index 100% rename from src/main/res/layout/drawer_list_item.xml rename to app/src/main/res/layout/drawer_list_item.xml diff --git a/src/main/res/layout/expanded_view.xml b/app/src/main/res/layout/expanded_view.xml similarity index 100% rename from src/main/res/layout/expanded_view.xml rename to app/src/main/res/layout/expanded_view.xml diff --git a/src/main/res/layout/fragment_activitylog.xml b/app/src/main/res/layout/fragment_activitylog.xml similarity index 100% rename from src/main/res/layout/fragment_activitylog.xml rename to app/src/main/res/layout/fragment_activitylog.xml diff --git a/src/main/res/layout/fragment_c_ontrol.xml b/app/src/main/res/layout/fragment_c_ontrol.xml similarity index 100% rename from src/main/res/layout/fragment_c_ontrol.xml rename to app/src/main/res/layout/fragment_c_ontrol.xml diff --git a/src/main/res/layout/fragment_c_portal_webview.xml b/app/src/main/res/layout/fragment_c_portal_webview.xml similarity index 100% rename from src/main/res/layout/fragment_c_portal_webview.xml rename to app/src/main/res/layout/fragment_c_portal_webview.xml diff --git a/src/main/res/layout/fragment_log_activity.xml b/app/src/main/res/layout/fragment_log_activity.xml similarity index 100% rename from src/main/res/layout/fragment_log_activity.xml rename to app/src/main/res/layout/fragment_log_activity.xml diff --git a/src/main/res/layout/fragment_mainbuttons.xml b/app/src/main/res/layout/fragment_mainbuttons.xml similarity index 100% rename from src/main/res/layout/fragment_mainbuttons.xml rename to app/src/main/res/layout/fragment_mainbuttons.xml diff --git a/src/main/res/layout/fragment_mission_detail.xml b/app/src/main/res/layout/fragment_mission_detail.xml similarity index 100% rename from src/main/res/layout/fragment_mission_detail.xml rename to app/src/main/res/layout/fragment_mission_detail.xml diff --git a/src/main/res/layout/fragment_ringbuttons.xml b/app/src/main/res/layout/fragment_ringbuttons.xml similarity index 100% rename from src/main/res/layout/fragment_ringbuttons.xml rename to app/src/main/res/layout/fragment_ringbuttons.xml diff --git a/src/main/res/layout/fragment_ringinfo.xml b/app/src/main/res/layout/fragment_ringinfo.xml similarity index 100% rename from src/main/res/layout/fragment_ringinfo.xml rename to app/src/main/res/layout/fragment_ringinfo.xml diff --git a/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml similarity index 100% rename from src/main/res/layout/fragment_stats.xml rename to app/src/main/res/layout/fragment_stats.xml diff --git a/src/main/res/layout/list_view.xml b/app/src/main/res/layout/list_view.xml similarity index 100% rename from src/main/res/layout/list_view.xml rename to app/src/main/res/layout/list_view.xml diff --git a/src/main/res/layout/stats_list_item.xml b/app/src/main/res/layout/stats_list_item.xml similarity index 100% rename from src/main/res/layout/stats_list_item.xml rename to app/src/main/res/layout/stats_list_item.xml diff --git a/src/main/res/layout/view_actionbar.xml b/app/src/main/res/layout/view_actionbar.xml similarity index 100% rename from src/main/res/layout/view_actionbar.xml rename to app/src/main/res/layout/view_actionbar.xml diff --git a/src/main/res/menu/activity_artefact.xml b/app/src/main/res/menu/activity_artefact.xml similarity index 100% rename from src/main/res/menu/activity_artefact.xml rename to app/src/main/res/menu/activity_artefact.xml diff --git a/src/main/res/menu/activity_bam.xml b/app/src/main/res/menu/activity_bam.xml similarity index 100% rename from src/main/res/menu/activity_bam.xml rename to app/src/main/res/menu/activity_bam.xml diff --git a/src/main/res/menu/activity_c_out.xml b/app/src/main/res/menu/activity_c_out.xml similarity index 100% rename from src/main/res/menu/activity_c_out.xml rename to app/src/main/res/menu/activity_c_out.xml diff --git a/src/main/res/menu/activity_c_portal.xml b/app/src/main/res/menu/activity_c_portal.xml similarity index 100% rename from src/main/res/menu/activity_c_portal.xml rename to app/src/main/res/menu/activity_c_portal.xml diff --git a/src/main/res/menu/activity_event.xml b/app/src/main/res/menu/activity_event.xml similarity index 100% rename from src/main/res/menu/activity_event.xml rename to app/src/main/res/menu/activity_event.xml diff --git a/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main.xml similarity index 100% rename from src/main/res/menu/activity_main.xml rename to app/src/main/res/menu/activity_main.xml diff --git a/src/main/res/menu/activity_map.xml b/app/src/main/res/menu/activity_map.xml similarity index 100% rename from src/main/res/menu/activity_map.xml rename to app/src/main/res/menu/activity_map.xml diff --git a/src/main/res/menu/activity_mission.xml b/app/src/main/res/menu/activity_mission.xml similarity index 100% rename from src/main/res/menu/activity_mission.xml rename to app/src/main/res/menu/activity_mission.xml diff --git a/src/main/res/menu/activity_user.xml b/app/src/main/res/menu/activity_user.xml similarity index 100% rename from src/main/res/menu/activity_user.xml rename to app/src/main/res/menu/activity_user.xml diff --git a/src/main/res/menu/activity_web.xml b/app/src/main/res/menu/activity_web.xml similarity index 100% rename from src/main/res/menu/activity_web.xml rename to app/src/main/res/menu/activity_web.xml diff --git a/src/main/res/menu/ccorder.xml b/app/src/main/res/menu/ccorder.xml similarity index 100% rename from src/main/res/menu/ccorder.xml rename to app/src/main/res/menu/ccorder.xml diff --git a/src/main/res/menu/mission.xml b/app/src/main/res/menu/mission.xml similarity index 100% rename from src/main/res/menu/mission.xml rename to app/src/main/res/menu/mission.xml diff --git a/src/main/res/menu/notification.xml b/app/src/main/res/menu/notification.xml similarity index 100% rename from src/main/res/menu/notification.xml rename to app/src/main/res/menu/notification.xml diff --git a/src/main/res/raw/bleeps.wav b/app/src/main/res/raw/bleeps.wav similarity index 100% rename from src/main/res/raw/bleeps.wav rename to app/src/main/res/raw/bleeps.wav diff --git a/src/main/res/raw/cacert.pem b/app/src/main/res/raw/cacert.pem similarity index 100% rename from src/main/res/raw/cacert.pem rename to app/src/main/res/raw/cacert.pem diff --git a/src/main/res/raw/cacert_class3.pem b/app/src/main/res/raw/cacert_class3.pem similarity index 100% rename from src/main/res/raw/cacert_class3.pem rename to app/src/main/res/raw/cacert_class3.pem diff --git a/src/main/res/raw/microwave_ding.wav b/app/src/main/res/raw/microwave_ding.wav similarity index 100% rename from src/main/res/raw/microwave_ding.wav rename to app/src/main/res/raw/microwave_ding.wav diff --git a/src/main/res/raw/scan.wav b/app/src/main/res/raw/scan.wav similarity index 100% rename from src/main/res/raw/scan.wav rename to app/src/main/res/raw/scan.wav diff --git a/src/main/res/raw/zap.wav b/app/src/main/res/raw/zap.wav similarity index 100% rename from src/main/res/raw/zap.wav rename to app/src/main/res/raw/zap.wav diff --git a/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from src/main/res/values-sw600dp/dimens.xml rename to app/src/main/res/values-sw600dp/dimens.xml diff --git a/src/main/res/values-sw720dp-land/dimens.xml b/app/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from src/main/res/values-sw720dp-land/dimens.xml rename to app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/src/main/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml similarity index 100% rename from src/main/res/values-v14/dimens.xml rename to app/src/main/res/values-v14/dimens.xml diff --git a/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from src/main/res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from src/main/res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml similarity index 100% rename from src/main/res/values/constants.xml rename to app/src/main/res/values/constants.xml diff --git a/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from src/main/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 99% rename from src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml index 600613c..ffd93ad 100644 --- a/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -146,7 +146,7 @@ c-beam v%s
- by smile, cketti, keyboardsurfer, ligi ät c-base.org + by smile, cketti, keyboardsurfer, ligi, saces ät c-base.org

The source code was released under the WTFPL, Version 2.0 and is available here:
https://github.com/c-base/c-beam-droid diff --git a/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/src/main/res/xml/c_beam_appwidget_info.xml b/app/src/main/res/xml/c_beam_appwidget_info.xml similarity index 100% rename from src/main/res/xml/c_beam_appwidget_info.xml rename to app/src/main/res/xml/c_beam_appwidget_info.xml diff --git a/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from src/main/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/src/noGCM/java/org/c_base/c_beam/GCMFacade.java b/app/src/noGCM/java/org/c_base/c_beam/GCMFacade.java similarity index 100% rename from src/noGCM/java/org/c_base/c_beam/GCMFacade.java rename to app/src/noGCM/java/org/c_base/c_beam/GCMFacade.java diff --git a/app/src/test/java/org/c_base/c_beam/ExampleUnitTest.java b/app/src/test/java/org/c_base/c_beam/ExampleUnitTest.java new file mode 100644 index 0000000..e2df38f --- /dev/null +++ b/app/src/test/java/org/c_base/c_beam/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package org.c_base.c_beam; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/src/withGCM/AndroidManifest.xml b/app/src/withGCM/AndroidManifest.xml similarity index 100% rename from src/withGCM/AndroidManifest.xml rename to app/src/withGCM/AndroidManifest.xml diff --git a/src/withGCM/java/org/c_base/c_beam/GCMFacade.java b/app/src/withGCM/java/org/c_base/c_beam/GCMFacade.java similarity index 100% rename from src/withGCM/java/org/c_base/c_beam/GCMFacade.java rename to app/src/withGCM/java/org/c_base/c_beam/GCMFacade.java diff --git a/src/withGCM/java/org/c_base/c_beam/GCMIntentService.java b/app/src/withGCM/java/org/c_base/c_beam/GCMIntentService.java similarity index 100% rename from src/withGCM/java/org/c_base/c_beam/GCMIntentService.java rename to app/src/withGCM/java/org/c_base/c_beam/GCMIntentService.java diff --git a/src/withGCM/java/org/c_base/c_beam/GCMManager.java b/app/src/withGCM/java/org/c_base/c_beam/GCMManager.java similarity index 100% rename from src/withGCM/java/org/c_base/c_beam/GCMManager.java rename to app/src/withGCM/java/org/c_base/c_beam/GCMManager.java diff --git a/build.gradle b/build.gradle index b78c9d9..c2eea8e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,60 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + buildscript { repositories { jcenter() } - dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - } -} - -apply plugin: 'com.android.application' -repositories { - mavenCentral() -} - -android { - compileSdkVersion 23 - buildToolsVersion '25.0.2' - - lintOptions { - checkReleaseBuilds false - // Or, if you prefer, you can continue to check for errors in release builds, - // but continue the build even when errors are found: - abortOnError false + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files } +} - flavorDimensions "gcm" - - productFlavors { - withGCM { - dimension "gcm" - } - - noGCM { - dimension "gcm" - } - +allprojects { + repositories { + jcenter() } - } - -dependencies { - compile 'com.androidplot:androidplot-core:0.6.1' - compile 'com.android.support:support-v4:20.0.0' - compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' - compile 'com.mcxiaoke.viewpagerindicator:library:2.4.1@aar' - compile 'com.madgag.spongycastle:core:1.51.0.0' - compile 'com.madgag.spongycastle:prov:1.51.0.0' - compile 'com.madgag.spongycastle:pkix:1.51.0.0' - compile 'com.thetransactioncompany:jsonrpc2-base:1.38' - compile 'com.thetransactioncompany:jsonrpc2-client:1.16.4' - //compile "com.google.android.gms:play-services-gcm:8.4.0" - compile('org.eclipse.paho:org.eclipse.paho.android.service:latest.integration') { - exclude module: 'support-v4' - } - compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:latest.integration' - withGCMCompile fileTree(dir: 'libs', include: '*.jar') -} \ No newline at end of file +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..82618ce --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +# 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=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + + diff --git a/ic_launcher-web.png b/ic_launcher-web.png deleted file mode 100644 index 8bd826f..0000000 Binary files a/ic_launcher-web.png and /dev/null differ diff --git a/ic_launcher_c_beam_online-web.png b/ic_launcher_c_beam_online-web.png deleted file mode 100644 index b69e4d6..0000000 Binary files a/ic_launcher_c_beam_online-web.png and /dev/null differ diff --git a/lint.xml b/lint.xml deleted file mode 100644 index ee0eead..0000000 --- a/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/proguard-project.txt b/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# 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 *; -#} diff --git a/project.properties b/project.properties deleted file mode 100644 index fb33192..0000000 --- a/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-17 - -android.library.reference.1=../actionbarsherlock diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'