diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 07df472..0000000 --- a/.drone.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -kind: pipeline -type: exec -name: default - -steps: -- name: build - commands: - - env - - bash ./gradlew assembleDebug diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..96b0754 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,9 @@ +pipeline: + build: + image: eclipse-temurin:11 + commands: + - bash ./gradlew assembleDebug + environment: + - ANDROID_HOME=/mnt/sdk + volumes: + - /home/woodpecker/sdk:/mnt/sdk diff --git a/app/build.gradle b/app/build.gradle index 49fb9c9..dd44510 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 32 defaultConfig { applicationId "fr.mobdev.goblim" - minSdkVersion 15 - targetSdkVersion 25 + minSdkVersion 21 + targetSdkVersion 32 versionCode 11 versionName "2.8" } @@ -18,15 +17,16 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - lintOptions { - checkReleaseBuilds false + lint { abortOnError false + checkReleaseBuilds false } + namespace 'fr.mobdev.goblim' + } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.activity:activity:1.5.1' + implementation 'com.google.android.material:material:1.6.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f7fbcb3..b5e41a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -14,8 +13,8 @@ android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:exported="true"> @@ -33,8 +32,8 @@ + android:theme="@style/AppTheme" + android:exported="true"> @@ -44,15 +43,15 @@ + android:theme="@style/AppTheme"/> + android:theme="@style/AppTheme"/> + android:theme="@style/AppTheme"/> \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..ba2350a Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/fr/mobdev/goblim/ImageListAdapter.java b/app/src/main/java/fr/mobdev/goblim/ImageListAdapter.java index 8e31567..fdb2835 100644 --- a/app/src/main/java/fr/mobdev/goblim/ImageListAdapter.java +++ b/app/src/main/java/fr/mobdev/goblim/ImageListAdapter.java @@ -21,13 +21,14 @@ package fr.mobdev.goblim; import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ProgressBar; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git a/app/src/main/java/fr/mobdev/goblim/MultiLinkAdapter.java b/app/src/main/java/fr/mobdev/goblim/MultiLinkAdapter.java index df43c71..605ab5d 100644 --- a/app/src/main/java/fr/mobdev/goblim/MultiLinkAdapter.java +++ b/app/src/main/java/fr/mobdev/goblim/MultiLinkAdapter.java @@ -18,8 +18,8 @@ package fr.mobdev.goblim; +import android.annotation.SuppressLint; import android.graphics.Bitmap; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,6 +27,8 @@ import android.widget.CheckBox; import android.widget.ImageView; import android.widget.ProgressBar; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import java.util.List; @@ -85,7 +87,7 @@ public class MultiLinkAdapter extends RecyclerView.Adapter{ } @Override - public void onBindViewHolder(MultiLinkViewHolder holder, int position) { + public void onBindViewHolder(MultiLinkViewHolder holder, @SuppressLint("RecyclerView") int position) { Bitmap bt = bitmaps.get(position); if(bt != null) { holder.progress.setVisibility(View.GONE); diff --git a/app/src/main/java/fr/mobdev/goblim/activity/HistoryActivity.java b/app/src/main/java/fr/mobdev/goblim/activity/HistoryActivity.java index e523761..af45154 100644 --- a/app/src/main/java/fr/mobdev/goblim/activity/HistoryActivity.java +++ b/app/src/main/java/fr/mobdev/goblim/activity/HistoryActivity.java @@ -23,10 +23,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Typeface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -38,6 +34,11 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -63,8 +64,6 @@ public class HistoryActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.history); - Toolbar toolbar = (Toolbar) findViewById(R.id.history_toolbar); - setSupportActionBar(toolbar); FloatingActionButton new_image_button = (FloatingActionButton) findViewById(R.id.new_image_button); new_image_button.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/fr/mobdev/goblim/activity/LinkActivity.java b/app/src/main/java/fr/mobdev/goblim/activity/LinkActivity.java index 5822786..2d13566 100644 --- a/app/src/main/java/fr/mobdev/goblim/activity/LinkActivity.java +++ b/app/src/main/java/fr/mobdev/goblim/activity/LinkActivity.java @@ -23,8 +23,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; @@ -33,6 +31,8 @@ import android.widget.TextView; import android.content.ClipboardManager; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import java.util.ArrayList; import java.util.Calendar; import java.util.List; @@ -54,9 +54,6 @@ public class LinkActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.link); - Toolbar toolbar = (Toolbar) findViewById(R.id.link_toolbar); - setSupportActionBar(toolbar); - //get url information Intent receiveIntent = getIntent(); Long imageId = receiveIntent.getLongExtra("imageId", -1); diff --git a/app/src/main/java/fr/mobdev/goblim/activity/MultiLinkActivity.java b/app/src/main/java/fr/mobdev/goblim/activity/MultiLinkActivity.java index e577644..483331b 100644 --- a/app/src/main/java/fr/mobdev/goblim/activity/MultiLinkActivity.java +++ b/app/src/main/java/fr/mobdev/goblim/activity/MultiLinkActivity.java @@ -23,16 +23,16 @@ import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Typeface; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.ImageButton; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -57,9 +57,6 @@ public class MultiLinkActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.multilink); - Toolbar toolbar = (Toolbar) findViewById(R.id.link_toolbar); - setSupportActionBar(toolbar); - //get url information Intent receiveIntent = getIntent(); Object[] extra = (Object[]) receiveIntent.getSerializableExtra("imageIds"); diff --git a/app/src/main/java/fr/mobdev/goblim/activity/ServersActivity.java b/app/src/main/java/fr/mobdev/goblim/activity/ServersActivity.java index ce9bcd3..7962582 100644 --- a/app/src/main/java/fr/mobdev/goblim/activity/ServersActivity.java +++ b/app/src/main/java/fr/mobdev/goblim/activity/ServersActivity.java @@ -23,8 +23,6 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.Typeface; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -36,6 +34,8 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import java.util.ArrayList; import java.util.List; @@ -59,9 +59,6 @@ public class ServersActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.servers); - Toolbar toolbar = (Toolbar) findViewById(R.id.servers_toolbar); - setSupportActionBar(toolbar); - ListView serverList = (ListView) findViewById(R.id.servers_list); serverList.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { @Override diff --git a/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java b/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java index 4b0deb5..7cce42c 100644 --- a/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java +++ b/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java @@ -30,11 +30,6 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.OpenableColumns; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -47,6 +42,11 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -93,9 +93,6 @@ public class UploadActivity extends AppCompatActivity { setContentView(R.layout.upload); uploadInProgress = false; - Toolbar toolbar = (Toolbar) findViewById(R.id.upload_toolbar); - setSupportActionBar(toolbar); - setTitle(R.string.upload_pict); hideImage(); @@ -595,37 +592,36 @@ public class UploadActivity extends AppCompatActivity { //ask for image file Intent requestFileIntent = new Intent(Intent.ACTION_PICK); requestFileIntent.setType("image/*"); - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) - requestFileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE,true); + requestFileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE,true); startActivityForResult(requestFileIntent, 0); } @Override public void onActivityResult(int requestCode, int resultCode,Intent returnIntent) { - if(resultCode == RESULT_OK){ + super.onActivityResult(requestCode, resultCode, returnIntent); + if (resultCode == RESULT_OK) { //retrieve uri from the request image activity and prepare ClipData clip = null; boolean hasAddUri = false; - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) - clip = returnIntent.getClipData(); + clip = returnIntent.getClipData(); LinearLayout infosLayout = (LinearLayout) findViewById(R.id.info_layout); FrameLayout dataLayout = (FrameLayout) findViewById(R.id.data_layout); - if(clip == null) { + if (clip == null) { Uri imageUri = returnIntent.getData(); - if(imageUri == null) + if (imageUri == null) return; uris.add(imageUri); hasAddUri = true; updateSpanCount(); - adapter.addUri(this,imageUri); + adapter.addUri(this, imageUri); infosLayout.setVisibility(View.GONE); dataLayout.setVisibility(View.VISIBLE); } else { - for(int i = 0; i < clip.getItemCount(); i++) { + for (int i = 0; i < clip.getItemCount(); i++) { Uri imageUri = clip.getItemAt(i).getUri(); - if(imageUri == null) + if (imageUri == null) continue; uris.add(imageUri); hasAddUri = true; @@ -638,7 +634,7 @@ public class UploadActivity extends AppCompatActivity { } } - if(hasAddUri) { + if (hasAddUri) { Button uploadBt = (Button) findViewById(R.id.upload_button); uploadBt.setEnabled(false); } diff --git a/app/src/main/java/fr/mobdev/goblim/dialog/ServerDialog.java b/app/src/main/java/fr/mobdev/goblim/dialog/ServerDialog.java index 33ad8fa..8caab2b 100644 --- a/app/src/main/java/fr/mobdev/goblim/dialog/ServerDialog.java +++ b/app/src/main/java/fr/mobdev/goblim/dialog/ServerDialog.java @@ -22,11 +22,12 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.DialogFragment; import android.view.View; import android.widget.EditText; import android.widget.Spinner; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; import fr.mobdev.goblim.Database; import fr.mobdev.goblim.listener.ServerListener; @@ -46,7 +47,8 @@ public class ServerDialog extends DialogFragment { } @Override - public @NonNull Dialog onCreateDialog(Bundle savedInstanceState) + public @NonNull + Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); final View view = View.inflate(getActivity(),R.layout.server_dialog, null); diff --git a/app/src/main/res/drawable-hdpi/ic_action_remove.png b/app/src/main/res/drawable-hdpi/ic_action_remove.png deleted file mode 100644 index 6ed9ee1..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_remove.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_sort.png b/app/src/main/res/drawable-hdpi/ic_action_sort.png deleted file mode 100644 index 3e2d52a..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_sort.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_remove.png b/app/src/main/res/drawable-mdpi/ic_action_remove.png deleted file mode 100644 index 3bb44ca..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_remove.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_sort.png b/app/src/main/res/drawable-mdpi/ic_action_sort.png deleted file mode 100644 index b628878..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_sort.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml new file mode 100644 index 0000000..5767a3b --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_background.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-xhdpi/ic_action_remove.png b/app/src/main/res/drawable-xhdpi/ic_action_remove.png deleted file mode 100644 index 3927462..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_remove.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_sort.png b/app/src/main/res/drawable-xhdpi/ic_action_sort.png deleted file mode 100644 index e281d8c..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_sort.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_remove.png b/app/src/main/res/drawable-xxhdpi/ic_action_remove.png deleted file mode 100644 index 6fbf514..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_remove.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_sort.png b/app/src/main/res/drawable-xxhdpi/ic_action_sort.png deleted file mode 100644 index a364d7a..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_sort.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_remove.png b/app/src/main/res/drawable-xxxhdpi/ic_action_remove.png deleted file mode 100644 index fc890d6..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_remove.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_sort.png b/app/src/main/res/drawable-xxxhdpi/ic_action_sort.png deleted file mode 100644 index 645926b..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_sort.png and /dev/null differ diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml new file mode 100644 index 0000000..7dd17b8 --- /dev/null +++ b/app/src/main/res/drawable/add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/add_photo.xml b/app/src/main/res/drawable/add_photo.xml new file mode 100644 index 0000000..2b4a73e --- /dev/null +++ b/app/src/main/res/drawable/add_photo.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/copy.xml b/app/src/main/res/drawable/copy.xml new file mode 100644 index 0000000..1411b24 --- /dev/null +++ b/app/src/main/res/drawable/copy.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml new file mode 100644 index 0000000..810729f --- /dev/null +++ b/app/src/main/res/drawable/delete.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/file_upload.xml b/app/src/main/res/drawable/file_upload.xml new file mode 100644 index 0000000..bbb7f99 --- /dev/null +++ b/app/src/main/res/drawable/file_upload.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..bb3ac6e --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/remove.xml b/app/src/main/res/drawable/remove.xml new file mode 100644 index 0000000..1a51268 --- /dev/null +++ b/app/src/main/res/drawable/remove.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml new file mode 100644 index 0000000..0411105 --- /dev/null +++ b/app/src/main/res/drawable/settings.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/share.xml b/app/src/main/res/drawable/share.xml new file mode 100644 index 0000000..232301c --- /dev/null +++ b/app/src/main/res/drawable/share.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/sort.xml b/app/src/main/res/drawable/sort.xml new file mode 100644 index 0000000..719bf08 --- /dev/null +++ b/app/src/main/res/drawable/sort.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout-land/upload.xml b/app/src/main/res/layout-land/upload.xml index 41c8652..a107047 100644 --- a/app/src/main/res/layout-land/upload.xml +++ b/app/src/main/res/layout-land/upload.xml @@ -1,5 +1,5 @@ - - - - - - - - + diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml index 9c650c2..ce2a047 100644 --- a/app/src/main/res/layout/history.xml +++ b/app/src/main/res/layout/history.xml @@ -1,5 +1,5 @@ - - - - - - - - - + diff --git a/app/src/main/res/layout/link.xml b/app/src/main/res/layout/link.xml index 40555cb..19f4cbd 100644 --- a/app/src/main/res/layout/link.xml +++ b/app/src/main/res/layout/link.xml @@ -1,5 +1,5 @@ - - - - - - - - + diff --git a/app/src/main/res/layout/multilink.xml b/app/src/main/res/layout/multilink.xml index 779fa0a..71daf56 100644 --- a/app/src/main/res/layout/multilink.xml +++ b/app/src/main/res/layout/multilink.xml @@ -1,5 +1,5 @@ - - - - - - - - + diff --git a/app/src/main/res/layout/server_item.xml b/app/src/main/res/layout/server_item.xml index 6c77ac2..16ff295 100644 --- a/app/src/main/res/layout/server_item.xml +++ b/app/src/main/res/layout/server_item.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/layout/servers.xml b/app/src/main/res/layout/servers.xml index 88ef015..21194c1 100644 --- a/app/src/main/res/layout/servers.xml +++ b/app/src/main/res/layout/servers.xml @@ -1,5 +1,5 @@ - - - - - - - + diff --git a/app/src/main/res/layout/thumb_items.xml b/app/src/main/res/layout/thumb_items.xml index 8df65b2..65a3764 100644 --- a/app/src/main/res/layout/thumb_items.xml +++ b/app/src/main/res/layout/thumb_items.xml @@ -17,15 +17,15 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" /> + + android:layout_alignParentEnd="true" + android:layout_marginBottom="10dp" + android:scaleType="fitCenter" + android:background="@drawable/delete" /> \ No newline at end of file diff --git a/app/src/main/res/layout/upload.xml b/app/src/main/res/layout/upload.xml index d1eb5d3..286176e 100644 --- a/app/src/main/res/layout/upload.xml +++ b/app/src/main/res/layout/upload.xml @@ -1,5 +1,5 @@ - - - - - - - - + diff --git a/app/src/main/res/menu/menu_history.xml b/app/src/main/res/menu/menu_history.xml index fd7f069..44c646d 100644 --- a/app/src/main/res/menu/menu_history.xml +++ b/app/src/main/res/menu/menu_history.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context="fr.mobdev.goblim.activity.HistoryActivity"> diff --git a/app/src/main/res/menu/menu_servers.xml b/app/src/main/res/menu/menu_servers.xml index b42c77e..91999de 100644 --- a/app/src/main/res/menu/menu_servers.xml +++ b/app/src/main/res/menu/menu_servers.xml @@ -2,7 +2,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context="fr.mobdev.goblim.activity.ServersActivity"> diff --git a/app/src/main/res/menu/menu_upload.xml b/app/src/main/res/menu/menu_upload.xml index deedda9..8c81ec6 100644 --- a/app/src/main/res/menu/menu_upload.xml +++ b/app/src/main/res/menu/menu_upload.xml @@ -2,17 +2,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity"> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index f32dcec..e2d379b 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..875f07e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c0839a3..44ca098 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..8660d44 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 99b3dfb..b9a9792 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..c7f7bad Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 5e11245..f8e0c99 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8c566f6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..a92d66c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..3f38999 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..2c68d29 --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,8 @@ + + + #c41b66 + #ea619e + #FFFFFF + #FFFFFF + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml deleted file mode 100644 index 6b23c86..0000000 --- a/app/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml deleted file mode 100644 index 26ca50d..0000000 --- a/app/src/main/res/values-v23/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml deleted file mode 100644 index 63fc816..0000000 --- a/app/src/main/res/values-w820dp/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 64dp - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 265fc07..57a5e0f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,5 +2,7 @@ #c41b66 #ea619e - #a0c41b66 + #000000 + #FFFFFF + #000000 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index aa1f4ae..3137072 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,19 +1,31 @@ - - - + diff --git a/build.gradle b/build.gradle index c2eea8e..1b36f23 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { - jcenter() + mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:7.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,7 +15,8 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() + google() } } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ad171d2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +## 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. +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# +# 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 +#Fri Sep 16 10:11:32 CEST 2022 +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64..1948b90 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1eafff9..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Mar 04 02:18:36 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 91a7e26..cccdd3d --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,47 +6,6 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line