Skip to content

Commit

Permalink
Merge pull request #46 from kaczmarkiewiczp/dev
Browse files Browse the repository at this point in the history
Add changelog
  • Loading branch information
patrykcoding authored Apr 18, 2018
2 parents dfbe0d6 + 2b511a4 commit 0e804a9
Show file tree
Hide file tree
Showing 11 changed files with 108 additions and 1 deletion.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Credits/Libraries
- [Droppy](https://github.com/shehabic/Droppy) - A simple yet-powerful and fully customizable Android drop-down menu. It supports Text with/without Icons, Separators, and even fully customized views.
- [ExFile Picker](https://github.com/bartwell/ExFilePicker) - Open source Android library. Implement choosing files and directories in your application.
- [Floating Action Button SpeedDial](https://github.com/leinardi/FloatingActionButtonSpeedDial) - A Floating Action Button Speed Dial implementation for Android that follows the Material Design specification
- [Markdown View](https://github.com/falnatsheh/MarkdownView) - MarkdownView is an Android webview with the capablity of loading Markdown text or file and display it as HTML, it uses MarkdownJ and extends Android webview.
- [Material Dialogs](https://github.com/afollestad/material-dialogs) - A beautiful, fluid, and customizable dialogs API
- [rclone](https://github.com/ncw/rclone) - "rsync for cloud storage"
- Icon made by [Smashicons](https://www.flaticon.com/authors/smashicons) from [Flaticon](https://www.flaticon.com)
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies {
implementation 'com.mikepenz:community-material-typeface:2.0.46.1@aar'
implementation 'com.mikepenz:fontawesome-typeface:5.0.6.0@aar'
implementation "com.mikepenz:aboutlibraries:6.0.8"
implementation 'us.feras.mdv:markdownview:1.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
android:name=".AboutActivity"
android:label="@string/title_activity_about"
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name=".ChangelogActivity"
android:label="@string/title_activity_changelog"
android:theme="@style/AppTheme.NoActionBar"
android:parentActivityName=".AboutActivity"/>


</application>

</manifest>
10 changes: 10 additions & 0 deletions app/src/main/assets/changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### Version 0.3.0-alpha
***

* **New:** Changelog added under About screen
* **New:** Clicking on File/Folder icon will select it
* **New:** App icon
* **Fix:** Status bar color

***

3 changes: 2 additions & 1 deletion app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ public boolean onSupportNavigateUp() {
}

private void showChangelog() {
Toast.makeText(this, "Coming soon", Toast.LENGTH_SHORT).show();
Intent changelogIntent = new Intent(this, ChangelogActivity.class);
startActivity(changelogIntent);
}

private void showOpenSourceLibraries() {
Expand Down
34 changes: 34 additions & 0 deletions app/src/main/java/ca/pkay/rcloneexplorer/ChangelogActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package ca.pkay.rcloneexplorer;

import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;

import us.feras.mdv.MarkdownView;


public class ChangelogActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_changelog);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowHomeEnabled(true);
}

MarkdownView markdownView = findViewById(R.id.markdownView);
markdownView.loadMarkdownFile("file:///android_asset/changelog.md");
}

@Override
public boolean onSupportNavigateUp() {
onBackPressed();
return true;
}
}
26 changes: 26 additions & 0 deletions app/src/main/res/layout/activity_changelog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#DDDDDD"
tools:context=".ChangelogActivity">

<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">

<android.support.v7.widget.Toolbar
android:id="@+id/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>

<include layout="@layout/content_changelog" />

</android.support.design.widget.CoordinatorLayout>
12 changes: 12 additions & 0 deletions app/src/main/res/layout/content_changelog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<us.feras.mdv.MarkdownView
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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/markdownView"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".AboutActivity"
tools:showIn="@layout/activity_about" >
</us.feras.mdv.MarkdownView>
13 changes: 13 additions & 0 deletions app/src/main/res/values/about_libraries_markdown_view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="define_MarkdownView"></string>
<string name="library_MarkdownView_author">Feras Alnatsheh</string>
<string name="library_MarkdownView_authorWebsite">https://github.com/falnatsheh/</string>
<string name="library_MarkdownView_libraryName">Markdown View</string>
<string name="library_MarkdownView_libraryDescription">MarkdownView is an Android webview with the capablity of loading Markdown text or file and display it as HTML, it uses MarkdownJ and extends Android webview.</string>
<string name="library_MarkdownView_libraryVersion"></string>
<string name="library_MarkdownView_libraryWebsite">https://github.com/falnatsheh/MarkdownView/</string>
<string name="library_MarkdownView_licenseId">apache_2.0</string>
<string name="library_MarkdownView_isOpenSource">true</string>
<string name="library_MarkdownView_repositoryLink">https://github.com/falnatsheh/MarkdownView/</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@

<string name="action_settings">Settings</string>
<string name="title_activity_about">About</string>
<string name="title_activity_changelog">Changelog</string>
</resources>

0 comments on commit 0e804a9

Please sign in to comment.