Skip to content
Permalink
Browse files

Merged Japanese Resources from Master

  • Loading branch information...
michaelachmann committed Feb 4, 2017
2 parents 37e299f + ce6a59c commit ce970f72266eccc3be5a86fee446f81d4418b66c

This file was deleted.

Oops, something went wrong.
@@ -12,14 +12,14 @@ android:
- extra-google-m2repository
- extra-android-m2repository

before_install:
- chmod +x gradlew

licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

before_install:
- chmod +x gradlew

env:
global:
# install timeout in minutes (2 minutes by default)
@@ -1,23 +1,44 @@
# LnkShortener
<img src="/icons/LnkShortenerRobo114.png">
[![Build Status](https://travis-ci.org/michaelachmann/LnkShortener.svg?branch=master)](https://travis-ci.org/michaelachmann/LnkShortener) [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://img.shields.io/badge/license-GPLv3-blue.svg)
<img src="/icons/LnkShortenerRobo512.png" align="left" height="114">
# LnkShortener [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://img.shields.io/badge/license-GPLv3-blue.svg) [![Twitter Follow](https://img.shields.io/twitter/follow/lnkshortener.svg?style=social&label=Follow)](https://twitter.com/lnkshortener) <sup> [Facebook](https://fb.com/lnkshortener) | [Website](https://android.1n.pm)</sup>


LnkShortener is an Android app for shortening URLs. It is using [Polr](https://github.com/Cydrobolt/polr), an open-source URL shortener

**[Getting Started](#getting-started) | [App Stores](#app-stores) | [Contribute](#contribute)**

## Getting Started
LnkShortener is an android app which makes use of the API provided by a [Polr](https://github.com/Cydrobolt/polr) installation. You can enter the endpoint of your own Polr installation as well as an API-key. You can [Download the binary](https://github.com/michaelachmann/LnkShortener/releases/tag/1.0) and install it on your android smartphone, clone the source and compile it for yourself or find it on the [Google Play Store](https://1n.pm/lnkshortener).
<img style="float:right; height:500px" height="500" align="right" src="/metadata/images/ScreenshotFramedEnglish.png" >

# Getting Started
You can download LnkShortener from one of the following App Stores or obtain the latest binaries from the [Releases](https://github.com/michaelachmann/LnkShortener/releases) page.

## App Stores
LnkShortener is at the moment available on <br />
<a href='https://1n.pm/lnkshortener'>
<img alt='Get it on Google Play' height='100' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
<br>
<a href='https://1n.pm/lnk_amzn'><img alt='Get it on the Amazon App Store' src='https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-underground-app-us-black.png'></a>

## Contribute
On the wiki there is a [ToDos Page](https://github.com/michaelachmann/LnkShortener/wiki/ToDo) which states the next goals for following releases. If you want to contribute send pull requests, help out finding bugs or send me a pm for the coordination of jobs.
<div style="height: 100px; vertical-align: middle; width: 260px; margin: 0; margin-left: auto; margin-right: auto;">
<a href='https://1n.pm/lnkshortener'> <img style="vertical-align: middle;" alt='Get it on Google Play' height='100' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
<br />
<a href='https://1n.pm/lnk_amzn'><img style="vertical-align: middle;" height="66" alt='Get it on the Amazon App Store' src='https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-underground-app-us-black.png'></a>
<br />
<a href="https://1n.pm/f-droid"><img style="vertical-align: middle;" src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80"></a>
</div>

## Use
LnkShortener is working out of the box. Simply share a link via the share function of your browser or any other app with LnkShortener and it will instantaneously display a shortened URL.
If you have a workin polr installation enable the API and obtain an API-Key. Open the Settings in LnkShortener and enter the address of your Polr server (e.g. https://1n.pm) including the protocol (e.g. https://). Afterwards copy and paste the API-Key to the next field and you're ready to go with your own domain.

## Using 1n.pm
If you don't have your own polr server there's still the possiblity to keep on using 1n.pm. If you want to receive analytics and click counts you need to [sign up](https://1n.pm/signup). After activating your account (please check your spam folder since the activation e-mail might have ended up there) you can [login](https://1n.pm/login) with your credentials.
In the righthandside corner there's a new drop-down menu with your username. From the drop-down choose [Dashboard](https://1n.pm/admin). On the next page select [Developer](https://1n.pm/admin#developer). Finally there is your API Key. Copy & Paste it into the API Key field in LnkShorteners Settings.

Finally after all every Link you shorten via the LnkShortener App will be saved on your 1n.pm account and available for analytics. In order to see your history visit the [Dashboard](https://1n.pm/admin) and choose [Links](https://1n.pm/admin#links).

This generally should work for every polr installation *as long as public sign up and analytics were activated by the administrator*.

# Contribute
Contribution is always welcome. On the [Projects Page](https://github.com/michaelachmann/LnkShortener/projects/1) there is a ToDos board with a schedule for the upcoming releases. Feel free to work on one of the issues. Also translations are always needed and always appreciated. So fare the app is available in English and German, these two languages will also stay in the main focus for upcoming releases.

If you have Ideas feel free to open an Issues or contact [Michael](https://github.com/michaelachmann) via mail.

## License
# License
> Copyright (C) 2017 Michael Achmann
>This program is free software: you can redistribute it and/or modify
@@ -33,19 +54,19 @@ On the wiki there is a [ToDos Page](https://github.com/michaelachmann/LnkShorten
>You should have received a copy of the GNU General Public License
>along with this program. If not, see <http://www.gnu.org/licenses/>.
## Dependencies
# Dependencies

* For QRCode support LnkShortener depends on [QRGen](https://github.com/kenglxn/QRGen), which is licensed under Apache 2.0

## Legal Attributions
### Google Play Logo
# Legal Attributions
## Google Play Logo
>Google Play and the Google Play logo are trademarks of Google Inc.
### Amazon Logo
## Amazon Logo
>Amazon and the Amazon logo are trademarks of Amazon Inc.
### Android Robot
## Android Robot
>The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.
### Material Icons
## Material Icons
>We have made these icons available for you to incorporate them into your products under the Apache License Version 2.0. Feel free to remix and re-share these icons and documentation in your products. We'd love attribution in your app's about screen, but it's not required. The only thing we ask is that you not re-sell these icons.
@@ -18,6 +18,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
lintOptions {
abortOnError false
}
}

dependencies {
@@ -29,10 +32,12 @@ dependencies {
compile 'com.android.support:support-v4:25.1.0'
compile 'com.android.support:support-vector-drawable:25.1.0'
compile 'com.android.volley:volley:1.0.0'

compile 'com.android.support:design:25.1.0'
compile 'com.android.support:recyclerview-v7:25.1.0'
compile 'com.android.support:cardview-v7:25.1.0'

compile 'com.github.kenglxn.QRGen:android:2.2.0'

testCompile 'junit:junit:4.12'
}
@@ -57,6 +57,7 @@
String shortUrl;
String originalUrl;


@Override
protected void onCreate(Bundle savedInstanceState) {

@@ -270,7 +271,6 @@ public void openLink(View view){
}
}


@Override
public void onStart() {
super.onStart();
@@ -21,7 +21,6 @@
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.util.Patterns;
import android.view.Menu;
import android.view.MenuInflater;
@@ -68,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
originalUrl = intent.getStringExtra(DisplayShortenedUrlActivity.EXTRA_MESSAGE);
errorMessage = intent.getStringExtra(DisplayShortenedUrlActivity.ERROR_MESSAGE);

// If an error occured in in DisplayShortenedUrlActivity they are passed on to MainFragment
// If an error occurred in in DisplayShortenedUrlActivity they are passed on to MainFragment
if (intent.getBooleanExtra(DisplayShortenedUrlActivity.ERROR_BOOL, false)) {
mainFragmentBundle.putBoolean("error", true);
mainFragmentBundle.putString("errorMessage", errorMessage);
@@ -0,0 +1,25 @@
<resources>
<string name="app_name">LnkShortener</string>
<string name="activity_settings">設定</string>

<!-- Strings for MainActivity -->
<string name="shorten">短縮</string>

<!-- Strings for DisplayShortenedUrlActivity -->
<string name="error_toast">エラーが発生しました。</string>
<string name="chooser_title">このリンクを共有...</string>
<string name="error_valid_url">正しい URL を入力してください。</string>
<string name="error_unauthorized">API バックエンドが認証されていません。</string>
<string name="error_404">もう一度やり直してください。</string>
<string name="error_quota">割り当てを超過しました。</string>
<string name="error_internal">内部サーバーエラー。</string>
<string name="error_misc">Polr の設定を確認してください!</string>
<string name="open_chooser_title">このリンクを開く...</string>
<string name="copied_to_clipboard">クリップボードにコピーしました</string>

<string name="activity_display_url">短縮した URL</string>

<string name="settings_domain">ドメインを設定</string>
<string name="settings_api_key">API キーを設定</string>

</resources>
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit ce970f7

Please sign in to comment.
You can’t perform that action at this time.