diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..0068d43 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,127 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..3f6cd0f Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..5971202 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..ae78c11 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,113 @@ + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..674414f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,11 @@ + - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 48b26e3..37b1ff1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2944ad7..0e0bd08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 + compileSdkVersion 29 buildToolsVersion '26.0.2' defaultConfig { - applicationId "com.example.h_mal.shift_tracker" + applicationId "com.appttude.h_mal.farmr" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -21,17 +21,15 @@ android { } dependencies { - implementation 'com.android.support:support-v4:25.4.0' - implementation 'com.android.support:support-vector-drawable:25.4.0' + implementation 'com.android.support:support-v4:26.1.0' + implementation 'com.android.support:support-vector-drawable:26.1.0' compile fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.4.0' - compile 'com.android.support:design:25.4.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.ajts.androidmads.SQLite2Excel:library:1.0.2' - - compile 'com.google.android.gms:play-services-ads:11.8.0' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:design:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.ajts.androidmads.SQLite2Excel:library:1.0.2' testCompile 'junit:junit:4.12' } diff --git a/app/src/androidTest/java/com/example/h_mal/shift_tracker/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/appttude/h_mal/farmr/ExampleInstrumentedTest.java similarity index 89% rename from app/src/androidTest/java/com/example/h_mal/shift_tracker/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/appttude/h_mal/farmr/ExampleInstrumentedTest.java index 7887498..d660d27 100644 --- a/app/src/androidTest/java/com/example/h_mal/shift_tracker/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -7,7 +7,7 @@ import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Instrumentation test, which will execute on an Android device. diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 72e509d..fb6eb7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,54 +1,40 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.appttude.h_mal.farmr"> + android:theme="@android:style/Theme.Black.NoTitleBar" + tools:ignore="LockedOrientationActivity"> - - - - - - - - - - - - - - - - diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..47587fd Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftProvider.java b/app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftProvider.java similarity index 98% rename from app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftProvider.java rename to app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftProvider.java index 200a6cf..964f1a8 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftProvider.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftProvider.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker.Data; +package com.appttude.h_mal.farmr.Data; import android.content.ContentProvider; import android.content.ContentUris; @@ -9,7 +9,7 @@ import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.util.Log; -import com.example.h_mal.shift_tracker.Data.ShiftsContract.ShiftsEntry; +import com.appttude.h_mal.farmr.Data.ShiftsContract.ShiftsEntry; /** * Created by h_mal on 26/12/2017. @@ -36,6 +36,7 @@ public class ShiftProvider extends ContentProvider { ShiftsDbHelper mDbHelper; public ShiftProvider() { + } @Override diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftsContract.java b/app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftsContract.java similarity index 92% rename from app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftsContract.java rename to app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftsContract.java index 5cf3734..93e7151 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftsContract.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftsContract.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker.Data; +package com.appttude.h_mal.farmr.Data; import android.content.ContentResolver; import android.net.Uri; @@ -12,7 +12,7 @@ public class ShiftsContract { private ShiftsContract() {} - public static final String CONTENT_AUTHORITY = "com.example.h_mal.shift_tracker"; + public static final String CONTENT_AUTHORITY = "com.appttude.h_mal.farmr"; public static final Uri BASE_CONTENT_URI = Uri.parse("content://" + CONTENT_AUTHORITY); diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftsDbHelper.java b/app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftsDbHelper.java similarity index 68% rename from app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftsDbHelper.java rename to app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftsDbHelper.java index a22b0a5..557606f 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/Data/ShiftsDbHelper.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/Data/ShiftsDbHelper.java @@ -1,10 +1,10 @@ -package com.example.h_mal.shift_tracker.Data; +package com.appttude.h_mal.farmr.Data; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import com.example.h_mal.shift_tracker.Data.ShiftsContract.ShiftsEntry; +import com.appttude.h_mal.farmr.Data.ShiftsContract.ShiftsEntry; /** * Created by h_mal on 26/12/2017. @@ -58,27 +58,6 @@ public class ShiftsDbHelper extends SQLiteOpenHelper { + ShiftsEntry.COLUMN_SHIFT_PAYRATE + " FLOAT NOT NULL DEFAULT 0, " + ShiftsEntry.COLUMN_SHIFT_TOTALPAY + " FLOAT NOT NULL DEFAULT 0)"; - private static final String DATABASE_ALTER_1 = - "ALTER TABLE " + ShiftsEntry.TABLE_NAME + " ADD COLUMN " - + ShiftsEntry.COLUMN_SHIFT_TYPE + " TEXT NOT NULL DEFAULT " + DEFAULT_TEXT + ";"; - - private static final String DATABASE_ALTER_2 = - "ALTER TABLE " + ShiftsEntry.TABLE_NAME + " ADD COLUMN " - + ShiftsEntry.COLUMN_SHIFT_UNIT + " FLOAT NOT NULL DEFAULT 0;"; - - private static final String DATABASE_ALTER_3 = - "ALTER TABLE " + ShiftsEntry.TABLE_NAME + " ADD COLUMN " - + ShiftsEntry.COLUMN_SHIFT_PAYRATE + " FLOAT NOT NULL DEFAULT 0;"; - - private static final String DATABASE_ALTER_4 = - "ALTER TABLE " + ShiftsEntry.TABLE_NAME + " ADD COLUMN " - + ShiftsEntry.COLUMN_SHIFT_TOTALPAY + " FLOAT NOT NULL DEFAULT 0;"; - - private static final String DATABASE_UPDATE_1 = - "UPDATE " + ShiftsEntry.TABLE_NAME + " SET " - + ShiftsEntry.COLUMN_SHIFT_TYPE + " = replace( " + ShiftsEntry.COLUMN_SHIFT_TYPE + ", 'hourly', 'Hourly' )" + - " WHERE " + ShiftsEntry.COLUMN_SHIFT_TYPE + " LIKE 'hourly%'"; - @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { if (oldVersion < newVersion) { diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/FilterDataFragment.java b/app/src/main/java/com/appttude/h_mal/farmr/FilterDataFragment.java similarity index 97% rename from app/src/main/java/com/example/h_mal/shift_tracker/FilterDataFragment.java rename to app/src/main/java/com/appttude/h_mal/farmr/FilterDataFragment.java index 5c91523..4c98c3c 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/FilterDataFragment.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/FilterDataFragment.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.app.DatePickerDialog; import android.os.Bundle; @@ -13,7 +13,7 @@ import android.widget.DatePicker; import android.widget.EditText; import android.widget.Spinner; -import com.example.h_mal.shift_tracker.Data.ShiftsContract; +import com.appttude.h_mal.farmr.Data.ShiftsContract; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -21,8 +21,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import static com.example.h_mal.shift_tracker.MainActivity.args; -import static com.example.h_mal.shift_tracker.MainActivity.selection; +import static com.appttude.h_mal.farmr.MainActivity.args; +import static com.appttude.h_mal.farmr.MainActivity.selection; public class FilterDataFragment extends Fragment { diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/FragmentAddItem.java b/app/src/main/java/com/appttude/h_mal/farmr/FragmentAddItem.java similarity index 99% rename from app/src/main/java/com/example/h_mal/shift_tracker/FragmentAddItem.java rename to app/src/main/java/com/appttude/h_mal/farmr/FragmentAddItem.java index 2b498c0..fc9e8f2 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/FragmentAddItem.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/FragmentAddItem.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.app.DatePickerDialog; import android.app.TimePickerDialog; @@ -29,7 +29,7 @@ import android.widget.TextView; import android.widget.TimePicker; import android.widget.Toast; -import com.example.h_mal.shift_tracker.Data.ShiftsContract; +import com.appttude.h_mal.farmr.Data.ShiftsContract; import java.util.Calendar; diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/FragmentMain.java b/app/src/main/java/com/appttude/h_mal/farmr/FragmentMain.java similarity index 94% rename from app/src/main/java/com/example/h_mal/shift_tracker/FragmentMain.java rename to app/src/main/java/com/appttude/h_mal/farmr/FragmentMain.java index 67995bd..64816be 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/FragmentMain.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/FragmentMain.java @@ -1,6 +1,7 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.Manifest; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.content.ContentValues; @@ -13,12 +14,14 @@ import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.os.StrictMode; +import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; import android.support.v4.app.ActivityCompat; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.app.LoaderManager; import android.support.v4.content.Loader; +import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -27,15 +30,15 @@ import android.widget.ListView; import android.widget.Toast; import com.ajts.androidmads.library.SQLiteToExcel; -import com.example.h_mal.shift_tracker.Data.ShiftsContract.ShiftsEntry; -import com.example.h_mal.shift_tracker.Data.ShiftsDbHelper; +import com.appttude.h_mal.farmr.Data.ShiftsContract.ShiftsEntry; +import com.appttude.h_mal.farmr.Data.ShiftsDbHelper; import java.io.File; -import static com.example.h_mal.shift_tracker.MainActivity.args; -import static com.example.h_mal.shift_tracker.MainActivity.filter; -import static com.example.h_mal.shift_tracker.MainActivity.selection; -import static com.example.h_mal.shift_tracker.MainActivity.sortOrder; +import static com.appttude.h_mal.farmr.MainActivity.args; +import static com.appttude.h_mal.farmr.MainActivity.filter; +import static com.appttude.h_mal.farmr.MainActivity.selection; +import static com.appttude.h_mal.farmr.MainActivity.sortOrder; public class FragmentMain extends Fragment implements @@ -212,6 +215,7 @@ public class FragmentMain extends Fragment implements .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface arg0, int arg1) { + int rowsDeleted = getActivity().getContentResolver().delete(ShiftsEntry.CONTENT_URI, null, null); Toast.makeText(getContext(), rowsDeleted + " Items Deleted", Toast.LENGTH_SHORT).show(); } @@ -296,7 +300,9 @@ public class FragmentMain extends Fragment implements database.insert(ShiftsEntry.TABLE_NAME_EXPORT, null, values); } - } finally { + }catch (Exception e){ + Log.e("FragmentMain", "ExportData: ", e); + }finally { ContentValues values = new ContentValues(); values.put(ShiftsEntry.COLUMN_SHIFT_DESCRIPTION, ""); values.put(ShiftsEntry.COLUMN_SHIFT_DATE, ""); @@ -378,10 +384,10 @@ public class FragmentMain extends Fragment implements int lines = 0; try { while (cursor.moveToNext()) { - final Float durationColumnIndex = cursor.getFloat(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_DURATION)); + final float durationColumnIndex = cursor.getFloat(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_DURATION)); final String typeColumnIndex = cursor.getString(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_TYPE)); - final Float unitColumnIndex = cursor.getFloat(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_UNIT)); - final Float totalpayColumnIndex = cursor.getFloat(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_TOTALPAY)); + final float unitColumnIndex = cursor.getFloat(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_UNIT)); + final float totalpayColumnIndex = cursor.getFloat(cursor.getColumnIndexOrThrow(ShiftsEntry.COLUMN_SHIFT_TOTALPAY)); totalDuration = totalDuration + durationColumnIndex; if (typeColumnIndex.contains("Hourly")){ @@ -404,6 +410,7 @@ public class FragmentMain extends Fragment implements return buildInfoString(totalDuration,countOfTypeH,countOfTypeP,totalUnits,totalPay,lines); } + @SuppressLint("DefaultLocale") public String buildInfoString(float totalDuration, int countOfTypeH, int countOfTypeP, float totalUnits, float totalPay, int lines){ String textString; textString = lines + " Shifts"; @@ -461,18 +468,16 @@ public class FragmentMain extends Fragment implements } @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); System.out.println("request code" + requestCode); - switch (requestCode) { - case MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE: { - if (grantResults.length > 0 - && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - exportDialog(); - }else{ - Toast.makeText(getContext(), "Storage Permissions denied", Toast.LENGTH_SHORT).show(); - } + if (requestCode == MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE) { + if (grantResults.length > 0 + && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + exportDialog(); + } else { + Toast.makeText(getContext(), "Storage Permissions denied", Toast.LENGTH_SHORT).show(); } } } diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/FurtherInfoFragment.java b/app/src/main/java/com/appttude/h_mal/farmr/FurtherInfoFragment.java similarity index 98% rename from app/src/main/java/com/example/h_mal/shift_tracker/FurtherInfoFragment.java rename to app/src/main/java/com/appttude/h_mal/farmr/FurtherInfoFragment.java index cd76d12..77dc060 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/FurtherInfoFragment.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/FurtherInfoFragment.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.database.Cursor; import android.net.Uri; @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import com.example.h_mal.shift_tracker.Data.ShiftsContract; +import com.appttude.h_mal.farmr.Data.ShiftsContract; public class FurtherInfoFragment extends Fragment implements diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/MainActivity.java b/app/src/main/java/com/appttude/h_mal/farmr/MainActivity.java similarity index 75% rename from app/src/main/java/com/example/h_mal/shift_tracker/MainActivity.java rename to app/src/main/java/com/appttude/h_mal/farmr/MainActivity.java index 712b4e0..5612f42 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/MainActivity.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.Manifest; import android.app.Activity; @@ -16,13 +16,6 @@ import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; -import android.view.View; -import android.widget.ProgressBar; - -import com.google.android.gms.ads.AdListener; -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.AdView; -import com.google.android.gms.ads.MobileAds; import java.util.List; @@ -35,8 +28,6 @@ public class MainActivity extends AppCompatActivity { public static String[] args; private static Toolbar toolbar; public static FragmentManager fragmentManager; - private AdView adView; - private ProgressBar progressBar; private String currentFragment; @Override @@ -53,8 +44,6 @@ public class MainActivity extends AppCompatActivity { FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); fragmentTransaction.replace(R.id.container,new FragmentMain()).addToBackStack("main").commit(); - progressBar = (ProgressBar) findViewById(R.id.progressBar2); - fragmentManager.addOnBackStackChangedListener(new FragmentManager.OnBackStackChangedListener() { @Override public void onBackStackChanged() { @@ -64,52 +53,6 @@ public class MainActivity extends AppCompatActivity { } }); - // Initialize the Mobile Ads SDK. - MobileAds.initialize(this, "ca-app-pub-3940256099942544~3347511713"); - - // Gets the ad view defined in layout/ad_fragment.xml with ad unit ID set in - // values/strings.xml. - adView = (AdView) findViewById(R.id.adView); - adView.setAdListener(new AdListener(){ - @Override - public void onAdOpened() { - // Code to be executed when an ad opens an overlay that - // covers the screen. - } - - @Override - public void onAdLeftApplication() { - // Code to be executed when the user has left the app. - } - - @Override - public void onAdClosed() { - // Code to be executed when when the user is about to return - // to the app after tapping on an ad. - } - @Override - public void onAdFailedToLoad(int i) { - super.onAdFailedToLoad(i); - progressBar.setVisibility(View.GONE); - } - - @Override - public void onAdLoaded() { - super.onAdLoaded(); - progressBar.setVisibility(View.GONE); - } - }); - // Create an ad request. Check your logcat output for the hashed device ID to - // get test ads on a physical device. e.g. - // "Use AdRequest.Builder.addTestDevice("ABCDEF012345") to get test ads on this device." - - AdRequest adRequest = new AdRequest.Builder() - .addTestDevice(AdRequest.DEVICE_ID_EMULATOR) - .build(); - - // Start loading the ad in the background. - adView.loadAd(adRequest); - } public static void setActionBarTitle(String title){ toolbar.setTitle(title); diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/ShiftsCursorAdapter.java b/app/src/main/java/com/appttude/h_mal/farmr/ShiftsCursorAdapter.java similarity index 97% rename from app/src/main/java/com/example/h_mal/shift_tracker/ShiftsCursorAdapter.java rename to app/src/main/java/com/appttude/h_mal/farmr/ShiftsCursorAdapter.java index 560f6ba..3631ad9 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/ShiftsCursorAdapter.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/ShiftsCursorAdapter.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.content.ContentUris; import android.content.Context; @@ -14,8 +14,8 @@ import android.widget.CursorAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.example.h_mal.shift_tracker.Data.ShiftProvider; -import com.example.h_mal.shift_tracker.Data.ShiftsContract.ShiftsEntry; +import com.appttude.h_mal.farmr.Data.ShiftProvider; +import com.appttude.h_mal.farmr.Data.ShiftsContract.ShiftsEntry; /** * Created by h_mal on 26/12/2017. diff --git a/app/src/main/java/com/example/h_mal/shift_tracker/SplashScreen.java b/app/src/main/java/com/appttude/h_mal/farmr/SplashScreen.java similarity index 95% rename from app/src/main/java/com/example/h_mal/shift_tracker/SplashScreen.java rename to app/src/main/java/com/appttude/h_mal/farmr/SplashScreen.java index 130fdfb..cc747cf 100644 --- a/app/src/main/java/com/example/h_mal/shift_tracker/SplashScreen.java +++ b/app/src/main/java/com/appttude/h_mal/farmr/SplashScreen.java @@ -1,4 +1,4 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import android.app.Activity; import android.content.Intent; @@ -36,7 +36,7 @@ public class SplashScreen extends Activity { // Start your app main activity // startActivity(i,bundle); startActivity(i); - overridePendingTransition(android.R.anim.fade_in,R.anim.hyperspace_jump); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); // finish(); } }, SPLASH_TIME_OUT); diff --git a/app/src/main/res/drawable-hdpi/splash.png b/app/src/main/res/drawable-hdpi/splash.png new file mode 100644 index 0000000..3d0dfb3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/app/src/main/res/drawable-mdpi/splash.png b/app/src/main/res/drawable-mdpi/splash.png new file mode 100644 index 0000000..85fa078 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/app/src/main/res/drawable-xhdpi/splash.png b/app/src/main/res/drawable-xhdpi/splash.png new file mode 100644 index 0000000..642a33e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/app/src/main/res/drawable-xxhdpi/splash.png b/app/src/main/res/drawable-xxhdpi/splash.png new file mode 100644 index 0000000..b31bd01 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/splash.png b/app/src/main/res/drawable-xxxhdpi/splash.png new file mode 100644 index 0000000..2e15f20 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/app/src/main/res/drawable/farmr.jpg b/app/src/main/res/drawable/farmr.jpg deleted file mode 100644 index cfa734d..0000000 Binary files a/app/src/main/res/drawable/farmr.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_release_background.xml b/app/src/main/res/drawable/ic_launcher_release_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_release_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 8db7e41..149f6c1 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,46 +1,9 @@ + android:id="@+id/splash_layout" + android:background="@drawable/splash"> - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_layout.xml b/app/src/main/res/layout/dialog_layout.xml index 0107d7f..faf810a 100644 --- a/app/src/main/res/layout/dialog_layout.xml +++ b/app/src/main/res/layout/dialog_layout.xml @@ -1,7 +1,6 @@ diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml index 10d1cee..8f6152b 100644 --- a/app/src/main/res/layout/fragment_add_item.xml +++ b/app/src/main/res/layout/fragment_add_item.xml @@ -1,6 +1,5 @@ + tools:context="com.appttude.h_mal.farmr.FilterDataFragment"> + tools:context="com.appttude.h_mal.farmr.FurtherInfoFragment"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index b823e6f..f964b7b 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -3,13 +3,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:ads="http://schemas.android.com/apk/res-auto" - tools:context="com.example.h_mal.shift_tracker.FragmentMain"> + tools:context="com.appttude.h_mal.farmr.FragmentMain"> + tools:listitem="@layout/list_item_1"> + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_1.xml b/app/src/main/res/layout/list_item_1.xml index 4695bf5..d728629 100644 --- a/app/src/main/res/layout/list_item_1.xml +++ b/app/src/main/res/layout/list_item_1.xml @@ -70,7 +70,7 @@ android:id="@+id/currency" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="$" + android:text="£" android:textColor="#728fcc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/main_view.xml b/app/src/main/res/layout/main_view.xml index aafdb33..8732118 100644 --- a/app/src/main/res/layout/main_view.xml +++ b/app/src/main/res/layout/main_view.xml @@ -1,7 +1,6 @@ - @@ -32,27 +34,12 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 8240985..0135299 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,7 +1,7 @@ + tools:context="com.appttude.h_mal.farmr.MainActivity"> 16dp 16dp 8dp + + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml deleted file mode 100644 index 6bd9192..0000000 --- a/app/src/main/res/xml/pref_data_sync.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml deleted file mode 100644 index 36569d6..0000000 --- a/app/src/main/res/xml/pref_general.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml deleted file mode 100644 index b11947e..0000000 --- a/app/src/main/res/xml/pref_headers.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - -
- -
- -
- - diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml deleted file mode 100644 index e5a319e..0000000 --- a/app/src/main/res/xml/pref_notification.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/test/java/com/example/h_mal/shift_tracker/ExampleUnitTest.java b/app/src/test/java/com/appttude/h_mal/farmr/ExampleUnitTest.java similarity index 80% rename from app/src/test/java/com/example/h_mal/shift_tracker/ExampleUnitTest.java rename to app/src/test/java/com/appttude/h_mal/farmr/ExampleUnitTest.java index 482f950..cfb3bfd 100644 --- a/app/src/test/java/com/example/h_mal/shift_tracker/ExampleUnitTest.java +++ b/app/src/test/java/com/appttude/h_mal/farmr/ExampleUnitTest.java @@ -1,8 +1,8 @@ -package com.example.h_mal.shift_tracker; +package com.appttude.h_mal.farmr; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Example local unit test, which will execute on the development machine (host). diff --git a/build.gradle b/build.gradle index 7e01a0a..64f23c7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,11 @@ buildscript { repositories { - jcenter() google() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.6.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,8 +15,9 @@ buildscript { allprojects { repositories { - jcenter() google() + jcenter() + maven { url 'https://jitpack.io' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0092a8f..d4d0a68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 05 21:21:28 AEDT 2018 +#Tue Apr 28 17:08:04 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip