Merge pull request #107 from clightning4j/release_3.7

Release 3.7 with the c-lightning v0.10.1

Author: vincenzopalazzo

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [vincenzopalazzo, lvaccaro]
+custom: [https://btctip.lvaccaro.com]

.github/workflows/android-master.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: set up JDK 1.8
+      - name: set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Check koltin formatting
         run: bash ./gradlew lintKotlin
       - name: Build debug APK

README.md

@@ -1,10 +1,42 @@
-# Lamp 
-<strong> [c-Lightning](https://github.com/ElementsProject/lightning) Android Mobile Porting </strong>
-
-[![build](https://github.com/clightning4j/lamp/workflows/android-master/badge.svg)](https://github.com/clightning4j/lamp/actions)
-[![release](https://github.com/clightning4j/lamp/workflows/release/badge.svg)](https://github.com/clightning4j/lamp/actions)
-[![MIT license](https://img.shields.io/github/license/clightning4j/lamp)](https://github.com/clightning4j/lamp/blob/master/LICENSE)
-
+<div align="center">
+  <h1>:bulb: Lamp :zap:</h1>
+
+  <img src="https://github.com/clightning4j/icons/blob/main/lamp_app/android/res/mipmap-xxxhdpi/ic_launcher.png" />
+
+  <p>
+    <strong> :bulb: <a href="https://github.com/ElementsProject/lightning">c-lightning</a> Android Mobile Porting :zap: </strong>
+  </p>
+
+  <p>
+      <a href="https://github.com/clightning4j/lamp/actions">
+        <img alt="GitHub Workflow Status (branch)" src="https://img.shields.io/github/workflow/status/clightning4j/lamp/android-master/master?style=flat-square">
+      </a>  
+      <a href="https://github.com/clightning4j/lamp/releases">
+        <img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/clightning4j/lamp?style=flat-square">
+      </a>
+      <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/clightning4j/lamp/total?style=flat-square">
+      <a href="https://github.com/clightning4j/lamp/blob/master/LICENSE">
+        <img alt="GitHub" src="https://img.shields.io/github/license/clightning4j/lamp?style=flat-square">
+      </a>
+  </p>
+
+  <p>
+    <a href="https://apt.izzysoft.de/fdroid/index/apk/com.lvaccaro.lamp">
+        <img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" width="200" height="80" />
+      </a>
+  </p>
+</div>
+
+## Table of Content
+
+- Introduction
+- How to Use
+- Build
+- How to Contribute
+- References
+- License
+
+## Introduction
 
 > This is an experimenting lightning wallet. Use it on testnet or only with amounts you can afford to lose on mainnet.
 
@@ -16,9 +48,11 @@ Touch the lamp to download and run c-lightning from cross-compiled binaries for
     <img src="doc/img/Screen3.png" width="230" height="350" />
 </span>
 
-## Bitcoin Setup
+## How to Use
+
+### Bitcoin Setup
 
-#### Automatic with esplora plugin
+##### Automatic with esplora plugin
 
 This is the default behaviour.
 
@@ -27,21 +61,21 @@ Lamp is using [the C Esplora plugin for C-lightning](https://github.com/clightni
 You can point it to your own [Esplora](github.com/Blockstream/esplora) instance in the settings, and it uses [blockstream.info](https://blockstream.info) by default.
 
 
-#### Manually with bitcoind rpc node
+##### Manually with bitcoind rpc node
 On Lamp settings, disable Esplora plugin and set the current Bitcoin RPC options:
 
 - Bitcoin RPC username
 - Bitcoin RPC password
 - Bitcoin RPC host (default 127.0.0.1)
 - Bitcoin RPC port (default 18332 for testnet)
 
-## Tor Setup
+### Tor Setup
 
-#### Automatic with internal tor service
+##### Automatic with internal tor service
 
 Lamp is using tor hidden service as default. A new hidden service will be created at the first running time.
 
-#### Manually with Orbot
+##### Manually with Orbot
 
 Open [Orbot](https://github.com/guardianproject/Orbot) and setup a fixed tor address by menu: Onion Services -> Hosted Services -> set a service name and port 9735. Restarting tor to discover and copy the local address.
 
@@ -56,13 +90,12 @@ Read the following instructions at [Tor on clightning](https://lightning.readthe
 ## Building
 
  * [in Linux using cmdline tools](doc/cmdline-tools-setup.md)
- 
-## Store Supported
-[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" width="200" height="80" />](https://apt.izzysoft.de/fdroid/index/apk/com.lvaccaro.lamp)
 
+## How to Contribute
 
+Just propose new stuff to add or bug fixing with a new PR.
 
-## Code Style
+### Code Style
 [![ktlint](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/)
 
 > We live in a world where robots can drive a car, so we shouldn't just write code, we should write elegant code.
@@ -81,3 +114,26 @@ before submit the code check the Kotlin format with the following command on the
 - [clightning_ndk](https://github.com/clightning4j/lightning_ndk) android cross-compilation of c-lightning for Android >= 24 Api
 - [c-lightning](https://github.com/ElementsProject/lightning) Lightning Network implementation in C
 - [esplora plugin](https://github.com/clightning4j/esplora_clnd_plugin) C-Lightning plugin for esplora
+
+## License
+
+<div align="center">
+  <img src="https://opensource.org/files/osi_keyhole_300X300_90ppi_0.png" width="150" height="150"/>
+</div>
+
+c-lightning Android Mobile Porting
+
+Copyright (c) 2019-2021 Luca Vaccaro
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.lvaccaro.lamp"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 36
-        versionName "3.6"
+        versionCode 37
+        versionName "3.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/ic_launcher-web.png

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

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jmailen.gradle:kotlinter-gradle:3.4.0"
         // NOTE: Do not place your application dependencies here; they belong

app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip