Merge pull request 'dark_theme' (#9) from dark_theme into master

Reviewed-on: #9
master
Schoumi 2 weeks ago
commit 0e294818a2
  1. 10
      .drone.yml
  2. 9
      .woodpecker.yml
  3. 20
      app/build.gradle
  4. 17
      app/src/main/AndroidManifest.xml
  5. BIN
      app/src/main/ic_launcher-playstore.png
  6. 3
      app/src/main/java/fr/mobdev/goblim/ImageListAdapter.java
  7. 6
      app/src/main/java/fr/mobdev/goblim/MultiLinkAdapter.java
  8. 11
      app/src/main/java/fr/mobdev/goblim/activity/HistoryActivity.java
  9. 7
      app/src/main/java/fr/mobdev/goblim/activity/LinkActivity.java
  10. 11
      app/src/main/java/fr/mobdev/goblim/activity/MultiLinkActivity.java
  11. 7
      app/src/main/java/fr/mobdev/goblim/activity/ServersActivity.java
  12. 34
      app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java
  13. 8
      app/src/main/java/fr/mobdev/goblim/dialog/ServerDialog.java
  14. BIN
      app/src/main/res/drawable-hdpi/ic_action_remove.png
  15. BIN
      app/src/main/res/drawable-hdpi/ic_action_sort.png
  16. BIN
      app/src/main/res/drawable-mdpi/ic_action_remove.png
  17. BIN
      app/src/main/res/drawable-mdpi/ic_action_sort.png
  18. 29
      app/src/main/res/drawable-v24/ic_launcher_background.xml
  19. BIN
      app/src/main/res/drawable-xhdpi/ic_action_remove.png
  20. BIN
      app/src/main/res/drawable-xhdpi/ic_action_sort.png
  21. BIN
      app/src/main/res/drawable-xxhdpi/ic_action_remove.png
  22. BIN
      app/src/main/res/drawable-xxhdpi/ic_action_sort.png
  23. BIN
      app/src/main/res/drawable-xxxhdpi/ic_action_remove.png
  24. BIN
      app/src/main/res/drawable-xxxhdpi/ic_action_sort.png
  25. 10
      app/src/main/res/drawable/add.xml
  26. 10
      app/src/main/res/drawable/add_photo.xml
  27. 10
      app/src/main/res/drawable/copy.xml
  28. 10
      app/src/main/res/drawable/delete.xml
  29. 10
      app/src/main/res/drawable/file_upload.xml
  30. 113
      app/src/main/res/drawable/ic_launcher_foreground.xml
  31. 10
      app/src/main/res/drawable/remove.xml
  32. 10
      app/src/main/res/drawable/settings.xml
  33. 10
      app/src/main/res/drawable/share.xml
  34. 10
      app/src/main/res/drawable/sort.xml
  35. 24
      app/src/main/res/layout-land/upload.xml
  36. 23
      app/src/main/res/layout/history.xml
  37. 26
      app/src/main/res/layout/link.xml
  38. 28
      app/src/main/res/layout/multilink.xml
  39. 2
      app/src/main/res/layout/server_item.xml
  40. 18
      app/src/main/res/layout/servers.xml
  41. 12
      app/src/main/res/layout/thumb_items.xml
  42. 24
      app/src/main/res/layout/upload.xml
  43. 2
      app/src/main/res/menu/menu_history.xml
  44. 2
      app/src/main/res/menu/menu_servers.xml
  45. 6
      app/src/main/res/menu/menu_upload.xml
  46. 5
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  47. 5
      app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  48. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.png
  49. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.png
  50. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.png
  51. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.png
  52. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.png
  53. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  54. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  55. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  56. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  57. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  58. 8
      app/src/main/res/values-night/colors.xml
  59. 8
      app/src/main/res/values-v21/styles.xml
  60. 9
      app/src/main/res/values-v23/styles.xml
  61. 6
      app/src/main/res/values-w820dp/dimens.xml
  62. 4
      app/src/main/res/values/colors.xml
  63. 24
      app/src/main/res/values/styles.xml
  64. 8
      build.gradle
  65. 15
      gradle.properties
  66. BIN
      gradle/wrapper/gradle-wrapper.jar
  67. 3
      gradle/wrapper/gradle-wrapper.properties
  68. 78
      gradlew
  69. 14
      gradlew.bat

@ -1,10 +0,0 @@
---
kind: pipeline
type: exec
name: default
steps:
- name: build
commands:
- env
- bash ./gradlew assembleDebug

@ -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

@ -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'
}

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fr.mobdev.goblim">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -14,8 +13,8 @@
android:theme="@style/AppTheme">
<activity
android:name=".activity.UploadActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND" />
@ -33,8 +32,8 @@
</activity>
<activity
android:name=".activity.HistoryActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -44,15 +43,15 @@
<activity
android:name=".activity.LinkActivity"
android:label="@string/title_activity_link"
android:theme="@style/AppTheme.NoActionBar"/>
android:theme="@style/AppTheme"/>
<activity
android:name=".activity.ServersActivity"
android:label="@string/title_activity_servers"
android:theme="@style/AppTheme.NoActionBar"/>
android:theme="@style/AppTheme"/>
<activity
android:name=".activity.MultiLinkActivity"
android:label="@string/title_share_links"
android:theme="@style/AppTheme.NoActionBar"/>
android:theme="@style/AppTheme"/>
</application>
</manifest>

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

@ -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;

@ -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<MultiLinkViewHolder>{
}
@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);

@ -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() {

@ -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);

@ -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");

@ -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

@ -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);
}

@ -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);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 B

@ -0,0 +1,29 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="1.08"
android:scaleY="1.08">
<path
android:pathData="M0,0h100v100h-100z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt">
<aapt:attr name="android:fillColor">
<gradient
android:startX="49.65"
android:startY="99.82"
android:endX="50.68"
android:endY="0.18"
android:type="linear">
<item android:offset="0" android:color="#FFC41B66"/>
<item android:offset="1" android:color="#FFEA619E"/>
</gradient>
</aapt:attr>
</path>
</group>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M22.5,38V25.5H10V22.5H22.5V10H25.5V22.5H38V25.5H25.5V38Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M29.45,6V9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39H39Q39,39 39,39Q39,39 39,39V18.6H42V39Q42,40.2 41.1,41.1Q40.2,42 39,42H9Q7.8,42 6.9,41.1Q6,40.2 6,39V9Q6,7.8 6.9,6.9Q7.8,6 9,6ZM38,6V10.05H42.05V13.05H38V17.1H35V13.05H30.95V10.05H35V6ZM12,33.9H36L28.8,24.3L22.45,32.65L17.75,26.45ZM9,9V14.55V18.6V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M9,43.95Q7.8,43.95 6.9,43.05Q6,42.15 6,40.95V10.8H9V40.95Q9,40.95 9,40.95Q9,40.95 9,40.95H32.7V43.95ZM15,37.95Q13.8,37.95 12.9,37.05Q12,36.15 12,34.95V6.95Q12,5.75 12.9,4.85Q13.8,3.95 15,3.95H37Q38.2,3.95 39.1,4.85Q40,5.75 40,6.95V34.95Q40,36.15 39.1,37.05Q38.2,37.95 37,37.95ZM15,34.95H37Q37,34.95 37,34.95Q37,34.95 37,34.95V6.95Q37,6.95 37,6.95Q37,6.95 37,6.95H15Q15,6.95 15,6.95Q15,6.95 15,6.95V34.95Q15,34.95 15,34.95Q15,34.95 15,34.95ZM15,34.95Q15,34.95 15,34.95Q15,34.95 15,34.95V6.95Q15,6.95 15,6.95Q15,6.95 15,6.95Q15,6.95 15,6.95Q15,6.95 15,6.95V34.95Q15,34.95 15,34.95Q15,34.95 15,34.95Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M13.05,42Q11.8,42 10.925,41.125Q10.05,40.25 10.05,39V10.5H8V7.5H17.4V6H30.6V7.5H40V10.5H37.95V39Q37.95,40.2 37.05,41.1Q36.15,42 34.95,42ZM34.95,10.5H13.05V39Q13.05,39 13.05,39Q13.05,39 13.05,39H34.95Q34.95,39 34.95,39Q34.95,39 34.95,39ZM18.35,34.7H21.35V14.75H18.35ZM26.65,34.7H29.65V14.75H26.65ZM13.05,10.5V39Q13.05,39 13.05,39Q13.05,39 13.05,39Q13.05,39 13.05,39Q13.05,39 13.05,39Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M11,40Q9.8,40 8.9,39.1Q8,38.2 8,37V29.85H11V37Q11,37 11,37Q11,37 11,37H37Q37,37 37,37Q37,37 37,37V29.85H40V37Q40,38.2 39.1,39.1Q38.2,40 37,40ZM22.5,32.35V13.8L16.5,19.8L14.35,17.65L24,8L33.65,17.65L31.5,19.8L25.5,13.8V32.35Z"/>
</vector>

@ -0,0 +1,113 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.7776"
android:scaleY="0.7776"
android:translateX="15.12"
android:translateY="15.12">
<path
android:pathData="m87.66,46.85q0,-0.68 -0.29,-1.03 -0.29,-0.36 -0.85,-0.36 -0.58,0 -0.89,0.35 -0.29,0.35 -0.29,1.03l-0.25,-1.85q0.47,-1.28 1.32,-1.94 0.85,-0.68 1.89,-0.68 0.89,0 1.53,0.43 0.64,0.43 0.97,1.25 0.35,0.82 0.35,1.97v11h-3.48zM76.08,42.62h3.48v14.4h-3.48zM81.88,46.85q0,-0.68 -0.31,-1.03 -0.29,-0.36 -0.87,-0.36 -0.55,0 -0.85,0.35 -0.29,0.35 -0.29,1.03l-0.29,-1.79q0.46,-1.29 1.3,-1.98 0.85,-0.69 1.9,-0.69 0.92,0 1.55,0.39 0.65,0.39 0.98,1.14 0.33,0.75 0.33,1.83v11.29h-3.47z"
android:fillColor="#ffffff"/>
<path
android:pathData="m70.17,36.84h3.44v3.41h-3.44zM70.17,42.62h3.44v14.4h-3.44z"
android:fillColor="#ffffff"/>
<path
android:pathData="m43.44,21.08c-38.89,12.4 -24.88,52.97 -2.2,57.26 -34.93,3.04 -50.01,-48.72 2.2,-57.26z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m41.37,48.95c2.9,10.19 2.31,19.93 -0.26,29.41 8.59,-9.95 10.05,-19.9 0.26,-29.41z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m41.36,36.65c-3.4,-0 -6.16,2.44 -6.16,5.45 0,3.01 2.76,5.45 6.16,5.45 3.4,0 6.16,-2.44 6.16,-5.45 -0,-3.01 -2.76,-5.45 -6.16,-5.45zM41.35,37.46c2.04,0 3.56,2.72 3.56,4.59 -0,1.86 -1.53,4.63 -3.57,4.63 -2.04,-0 -3.68,-2.81 -3.68,-4.67 0,-1.86 1.65,-4.54 3.69,-4.54z"
android:strokeLineJoin="miter"
android:strokeWidth="3"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt"/>
<path
android:pathData="M50.78,32.44h4v46.46h-4z"
android:strokeLineJoin="miter"
android:strokeWidth="3"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt"/>
<path
android:pathData="m54.91,51.53c13.15,9.96 13.56,16.57 -0.15,27.35 21.87,-4.07 20.94,-22.85 0.15,-27.35z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m70.1,23.42c-0.39,0.04 -0.79,0.19 -1.11,0.29 -1.32,0.62 -2.69,1.27 -3.74,2.31 -0.42,0.42 -0.82,0.96 -1.12,1.47 -0.17,0.29 -0.31,0.59 -0.46,0.89 -0.82,1.81 -1.37,3.72 -1.91,5.63 -0.45,1.72 -0.89,3.44 -1.3,5.17 -0.78,0.39 -1.56,0.77 -2.35,1.13l-1.61,1.27c1.3,-0.63 2.59,-1.28 3.87,-1.97 -0.33,1.55 -0.54,3.13 -0.63,4.72 -0.04,1.16 0.12,2.34 0.47,3.45 0.22,0.43 0.43,0.97 0.85,1.25 0.21,0.14 0.48,0.2 0.69,0.26 0.26,0.07 0.71,0.08 1.07,0.11 0.87,0 1.78,-0.47 2.12,-0.89 0.34,-0.42 0.52,-0.63 0.58,-0.81 0.03,-0.1 0.08,-0.19 0.13,-0.28 0,0 -1.06,0.55 -1.36,0.63 -0.31,0.09 -0.87,0.01 -1.31,-0.07 -0.54,-0.19 -0.76,-0.69 -1,-1.17 -0.36,-1.08 -0.51,-2.23 -0.47,-3.36 0.07,-1.62 0.28,-3.24 0.64,-4.82 0.92,-0.53 1.84,-1.07 2.73,-1.65 0.5,-0.32 0.95,-0.7 1.43,-1.05 1.75,-1.54 3.11,-3.45 4.02,-5.59 0.43,-1.01 0.56,-1.59 0.86,-2.62 0.32,-1.29 0.61,-2.47 0.12,-3.75 -0.05,-0.08 -0.07,-0.16 -0.13,-0.23 -0.29,-0.3 -0.66,-0.36 -1.05,-0.32zM68.74,24.59c0.15,0 0.3,0.03 0.44,0.08 0.07,0.03 0.14,0.05 0.2,0.1 0.06,0.05 0.09,0.12 0.13,0.19 0.5,1.15 0.26,2.36 -0.01,3.55 -0.29,1.06 -0.38,1.53 -0.82,2.57 -0.9,2.13 -2.26,4 -4.01,5.5 -0.48,0.35 -0.96,0.68 -1.43,1.04 -0.02,0.02 0,0.06 -0.02,0.08 -0.32,0.19 -0.66,0.36 -0.98,0.54 0.4,-1.68 0.82,-3.36 1.26,-5.03 0.54,-1.9 1.09,-3.8 1.93,-5.6 0.16,-0.29 0.3,-0.59 0.48,-0.87 0.32,-0.52 0.71,-1.01 1.15,-1.43 0.16,-0.15 0.65,-0.38 0.73,-0.48 0.31,-0.11 0.63,-0.23 0.96,-0.22z"
android:strokeLineJoin="miter"
android:strokeWidth="3"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt"/>
<path
android:pathData="m43.44,21.08c-38.89,12.4 -24.88,52.97 -2.2,57.26 -34.93,3.04 -50.01,-48.72 2.2,-57.26z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m41.37,48.95c2.9,10.19 2.31,19.93 -0.26,29.41 8.59,-9.95 10.05,-19.9 0.26,-29.41z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m41.36,36.65c-3.4,-0 -6.16,2.44 -6.16,5.45 0,3.01 2.76,5.45 6.16,5.45 3.4,0 6.16,-2.44 6.16,-5.45 -0,-3.01 -2.76,-5.45 -6.16,-5.45zM41.35,37.46c2.04,0 3.56,2.72 3.56,4.59 -0,1.86 -1.53,4.63 -3.57,4.63 -2.04,-0 -3.68,-2.81 -3.68,-4.67 0,-1.86 1.65,-4.54 3.69,-4.54z"
android:strokeLineJoin="miter"
android:strokeWidth="3"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt"/>
<path
android:pathData="M50.78,32.44h4v46.46h-4z"
android:strokeLineJoin="miter"
android:strokeWidth="3"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt"/>
<path
android:pathData="m54.91,51.53c13.15,9.96 13.56,16.57 -0.15,27.35 21.87,-4.07 20.94,-22.85 0.15,-27.35z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m70.1,23.42c-0.39,0.04 -0.79,0.19 -1.11,0.29 -1.32,0.62 -2.69,1.27 -3.74,2.31 -0.42,0.42 -0.82,0.96 -1.12,1.47 -0.17,0.29 -0.31,0.59 -0.46,0.89 -0.82,1.81 -1.37,3.72 -1.91,5.63 -0.45,1.72 -0.89,3.44 -1.3,5.17 -0.78,0.39 -1.56,0.77 -2.35,1.13l-1.61,1.27c1.3,-0.63 2.59,-1.28 3.87,-1.97 -0.33,1.55 -0.54,3.13 -0.63,4.72 -0.04,1.16 0.12,2.34 0.47,3.45 0.22,0.43 0.43,0.97 0.85,1.25 0.21,0.14 0.48,0.2 0.69,0.26 0.26,0.07 0.71,0.08 1.07,0.11 0.87,0 1.78,-0.47 2.12,-0.89 0.34,-0.42 0.52,-0.63 0.58,-0.81 0.03,-0.1 0.08,-0.19 0.13,-0.28 0,0 -1.06,0.55 -1.36,0.63 -0.31,0.09 -0.87,0.01 -1.31,-0.07 -0.54,-0.19 -0.76,-0.69 -1,-1.17 -0.36,-1.08 -0.51,-2.23 -0.47,-3.36 0.07,-1.62 0.28,-3.24 0.64,-4.82 0.92,-0.53 1.84,-1.07 2.73,-1.65 0.5,-0.32 0.95,-0.7 1.43,-1.05 1.75,-1.54 3.11,-3.45 4.02,-5.59 0.43,-1.01 0.56,-1.59 0.86,-2.62 0.32,-1.29 0.61,-2.47 0.12,-3.75 -0.05,-0.08 -0.07,-0.16 -0.13,-0.23 -0.29,-0.3 -0.66,-0.36 -1.05,-0.32zM68.74,24.59c0.15,0 0.3,0.03 0.44,0.08 0.07,0.03 0.14,0.05 0.2,0.1 0.06,0.05 0.09,0.12 0.13,0.19 0.5,1.15 0.26,2.36 -0.01,3.55 -0.29,1.06 -0.38,1.53 -0.82,2.57 -0.9,2.13 -2.26,4 -4.01,5.5 -0.48,0.35 -0.96,0.68 -1.43,1.04 -0.02,0.02 0,0.06 -0.02,0.08 -0.32,0.19 -0.66,0.36 -0.98,0.54 0.4,-1.68 0.82,-3.36 1.26,-5.03 0.54,-1.9 1.09,-3.8 1.93,-5.6 0.16,-0.29 0.3,-0.59 0.48,-0.87 0.32,-0.52 0.71,-1.01 1.15,-1.43 0.16,-0.15 0.65,-0.38 0.73,-0.48 0.31,-0.11 0.63,-0.23 0.96,-0.22z"
android:strokeLineJoin="miter"
android:strokeWidth="3"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:strokeLineCap="butt"/>
</group>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M10,25.5V22.5H38V25.5Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19.4,44 L18.4,37.7Q17.45,37.35 16.4,36.75Q15.35,36.15 14.55,35.5L8.65,38.2L4,30L9.4,26.05Q9.3,25.6 9.275,25.025Q9.25,24.45 9.25,24Q9.25,23.55 9.275,22.975Q9.3,22.4 9.4,21.95L4,18L8.65,9.8L14.55,12.5Q15.35,11.85 16.4,11.25Q17.45,10.65 18.4,10.35L19.4,4H28.6L29.6,10.3Q30.55,10.65 31.625,11.225Q32.7,11.8 33.45,12.5L39.35,9.8L44,18L38.6,21.85Q38.7,22.35 38.725,22.925Q38.75,23.5 38.75,24Q38.75,24.5 38.725,25.05Q38.7,25.6 38.6,26.1L44,30L39.35,38.2L33.45,35.5Q32.65,36.15 31.625,36.775Q30.6,37.4 29.6,37.7L28.6,44ZM24,30.5Q26.7,30.5 28.6,28.6Q30.5,26.7 30.5,24Q30.5,21.3 28.6,19.4Q26.7,17.5 24,17.5Q21.3,17.5 19.4,19.4Q17.5,21.3 17.5,24Q17.5,26.7 19.4,28.6Q21.3,30.5 24,30.5ZM24,27.5Q22.55,27.5 21.525,26.475Q20.5,25.45 20.5,24Q20.5,22.55 21.525,21.525Q22.55,20.5 24,20.5Q25.45,20.5 26.475,21.525Q27.5,22.55 27.5,24Q27.5,25.45 26.475,26.475Q25.45,27.5 24,27.5ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24ZM21.8,41H26.2L26.9,35.4Q28.55,35 30.025,34.15Q31.5,33.3 32.7,32.1L38,34.4L40,30.8L35.3,27.35Q35.5,26.5 35.625,25.675Q35.75,24.85 35.75,24Q35.75,23.15 35.65,22.325Q35.55,21.5 35.3,20.65L40,17.2L38,13.6L32.7,15.9Q31.55,14.6 30.1,13.725Q28.65,12.85 26.9,12.6L26.2,7H21.8L21.1,12.6Q19.4,12.95 17.925,13.8Q16.45,14.65 15.3,15.9L10,13.6L8,17.2L12.7,20.65Q12.5,21.5 12.375,22.325Q12.25,23.15 12.25,24Q12.25,24.85 12.375,25.675Q12.5,26.5 12.7,27.35L8,30.8L10,34.4L15.3,32.1Q16.5,33.3 17.975,34.15Q19.45,35 21.1,35.4Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M36.35,44Q34,44 32.325,42.325Q30.65,40.65 30.65,38.3Q30.65,37.95 30.725,37.475Q30.8,37 30.95,36.6L15.8,27.8Q15.05,28.65 13.95,29.175Q12.85,29.7 11.7,29.7Q9.35,29.7 7.675,28.025Q6,26.35 6,24Q6,21.6 7.675,19.95Q9.35,18.3 11.7,18.3Q12.85,18.3 13.9,18.75Q14.95,19.2 15.8,20.05L30.95,11.35Q30.8,11 30.725,10.55Q30.65,10.1 30.65,9.7Q30.65,7.3 32.325,5.65Q34,4 36.35,4Q38.75,4 40.4,5.65Q42.05,7.3 42.05,9.7Q42.05,12.05 40.4,13.725Q38.75,15.4 36.35,15.4Q35.2,15.4 34.125,15.025Q33.05,14.65 32.3,13.8L17.15,22.2Q17.25,22.6 17.325,23.125Q17.4,23.65 17.4,24Q17.4,24.35 17.325,24.75Q17.25,25.15 17.15,25.55L32.3,34.15Q33.05,33.45 34.05,33.025Q35.05,32.6 36.35,32.6Q38.75,32.6 40.4,34.25Q42.05,35.9 42.05,38.3Q42.05,40.65 40.4,42.325Q38.75,44 36.35,44ZM36.35,12.4Q37.5,12.4 38.275,11.625Q39.05,10.85 39.05,9.7Q39.05,8.55 38.275,7.775Q37.5,7 36.35,7Q35.2,7 34.425,7.775Q33.65,8.55 33.65,9.7Q33.65,10.85 34.425,11.625Q35.2,12.4 36.35,12.4ZM11.7,26.7Q12.85,26.7 13.625,25.925Q14.4,25.15 14.4,24Q14.4,22.85 13.625,22.075Q12.85,21.3 11.7,21.3Q10.55,21.3 9.775,22.075Q9,22.85 9,24Q9,25.15 9.775,25.925Q10.55,26.7 11.7,26.7ZM36.35,41Q37.5,41 38.275,40.225Q39.05,39.45 39.05,38.3Q39.05,37.15 38.275,36.375Q37.5,35.6 36.35,35.6Q35.2,35.6 34.425,36.375Q33.65,37.15 33.65,38.3Q33.65,39.45 34.425,40.225Q35.2,41 36.35,41ZM36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7Q36.35,9.7 36.35,9.7ZM11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24Q11.7,24 11.7,24ZM36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Q36.35,38.3 36.35,38.3Z"/>
</vector>

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,36V33H18V36ZM6,25.5V22.5H30V25.5ZM6,15V12H42V15Z"/>
</vector>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,20 +9,6 @@
tools:context="fr.mobdev.goblim.activity.HistoryActivity"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.PopupOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/upload_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:paddingLeft="@dimen/activity_horizontal_margin"
@ -90,7 +76,7 @@
android:gravity="center"
>
<ImageView
android:src="@android:drawable/ic_menu_add"
android:src="@drawable/add_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
@ -110,11 +96,11 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/imageList"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
/>
<ImageView
android:id="@+id/thumbnail_main"
@ -124,4 +110,4 @@
</FrameLayout>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -8,21 +8,6 @@
android:layout_width="match_parent"
tools:context="fr.mobdev.goblim.activity.HistoryActivity"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.PopupOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/history_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:paddingLeft="@dimen/activity_horizontal_margin"
@ -40,15 +25,15 @@
</RelativeLayout>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/new_image_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:src="@android:drawable/stat_sys_upload"
android:src="@drawable/file_upload"
app:borderWidth="0dp"
app:elevation="0dp"
/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -8,21 +8,6 @@
android:layout_width="match_parent"
tools:context="fr.mobdev.goblim.activity.LinkActivity"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.PopupOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/link_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:paddingLeft="@dimen/activity_horizontal_margin"
@ -46,6 +31,7 @@
android:layout_above="@+id/buttons_layout"
android:layout_centerHorizontal="true"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="https://pouet.net"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -64,24 +50,24 @@
>
<ImageButton
android:id="@+id/copy_clipboard_button"
android:src="@drawable/abc_ic_menu_copy_mtrl_am_alpha"
android:src="@drawable/copy"
android:layout_width="60dp"
android:layout_height="60dp"
/>
<ImageButton
android:src="@android:drawable/ic_menu_share"
android:src="@drawable/share"
android:id="@+id/share_button"
android:layout_width="60dp"
android:layout_height="60dp"
/>
<ImageButton
android:src="@android:drawable/ic_menu_delete"
android:src="@drawable/delete"
android:layout_width="60dp"
android:layout_height="60dp"
android:id="@+id/delete_button"
/>
</LinearLayout>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,20 +9,6 @@
tools:context="fr.mobdev.goblim.activity.MultiLinkActivity"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.PopupOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/link_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:paddingBottom="@dimen/activity_vertical_margin"
@ -32,14 +18,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_above="@+id/link"
android:id="@+id/link_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2"/>
<TextView
@ -64,24 +50,24 @@
>
<ImageButton
android:id="@+id/copy_clipboard_button"
android:src="@drawable/abc_ic_menu_copy_mtrl_am_alpha"
android:src="@drawable/copy"
android:layout_width="60dp"
android:layout_height="60dp"
/>
<ImageButton
android:src="@android:drawable/ic_menu_share"
android:src="@drawable/share"
android:id="@+id/share_button"
android:layout_width="60dp"
android:layout_height="60dp"
/>
<ImageButton
android:src="@android:drawable/ic_menu_delete"
android:src="@drawable/delete"
android:layout_width="60dp"
android:layout_height="60dp"
android:id="@+id/delete_button"
/>
</LinearLayout>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

@ -5,7 +5,7 @@
<ImageView
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:src="@drawable/ic_action_remove"
android:src="@drawable/remove"
android:id="@+id/server_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,20 +9,6 @@
tools:context="fr.mobdev.goblim.activity.ServersActivity"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.PopupOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/servers_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:paddingLeft="@dimen/activity_horizontal_margin"
@ -50,4 +36,4 @@
android:choiceMode="singleChoice"
/>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

@ -17,15 +17,15 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
/>
<ImageButton
android:id="@+id/reset_img"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginBottom="10dp"
android:src="@android:drawable/ic_delete"
android:id="@+id/reset_img"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
/>
android:layout_alignParentEnd="true"
android:layout_marginBottom="10dp"
android:scaleType="fitCenter"
android:background="@drawable/delete" />
</RelativeLayout>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,20 +9,6 @@
tools:context="fr.mobdev.goblim.activity.UploadActivity"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.PopupOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/upload_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:paddingLeft="@dimen/activity_horizontal_margin"
@ -81,7 +67,7 @@
android:gravity="center"
>
<ImageView
android:src="@android:drawable/ic_menu_add"
android:src="@drawable/add_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
@ -100,11 +86,11 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/imageList"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
/>
<ImageView
android:id="@+id/thumbnail_main"
@ -113,4 +99,4 @@
/>
</FrameLayout>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

@ -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">
<item android:id="@+id/action_change_order"
android:icon="@drawable/ic_action_sort"
android:icon="@drawable/sort"
android:title="@string/reorder_history"
app:showAsAction="ifRoom" />
</menu>

@ -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">
<item android:id="@+id/action_add_server"
android:icon="@android:drawable/ic_menu_add"
android:icon="@drawable/add"
android:title="@string/add_server"
app:showAsAction="ifRoom" />
</menu>

@ -2,17 +2,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
<item
android:icon="@android:drawable/ic_menu_add"
android:icon="@drawable/add_photo"
android:id="@+id/action_add_image"
android:title="@string/add_image"
app:showAsAction="ifRoom" />
<item
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:icon="@drawable/delete"
android:id="@+id/action_clear"
android:title="@string/clear_image_selection"
app:showAsAction="ifRoom" />
<item
android:icon="@android:drawable/ic_menu_manage"
android:icon="@drawable/settings"
android:id="@+id/action_manage_server"
android:title="@string/manage_server"
app:showAsAction="ifRoom" />

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimaryDark">#c41b66</color>
<color name="colorPrimary">#ea619e</color>
<color name="colorAccent">#FFFFFF</color>
<color name="colorOnSecondary">#FFFFFF</color>
<color name="icon">#FFFFFF</color>
</resources>

@ -1,8 +0,0 @@
<resources>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
</resources>

@ -1,9 +0,0 @@
<resources>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:titleTextColor">@android:color/black</item>
</style>
</resources>

@ -1,6 +0,0 @@
<resources>
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>

@ -2,5 +2,7 @@
<resources>
<color name="colorPrimaryDark">#c41b66</color>
<color name="colorPrimary">#ea619e</color>
<color name="colorAccent">#a0c41b66</color>
<color name="colorAccent">#000000</color>
<color name="colorOnSecondary">#FFFFFF</color>
<color name="icon">#000000</color>
</resources>

@ -1,19 +1,31 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>