Skip to content

Commit 0e804a9

Browse files
patrykcodingpatrykcoding
authored
Merge pull request #46 from kaczmarkiewiczp/dev
Add changelog
2 parents dfbe0d6 + 2b511a4 commit 0e804a9

11 files changed

+108
-1
lines changed

‎.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Credits/Libraries
3333
- [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.
3434
- [ExFile Picker](https://github.com/bartwell/ExFilePicker) - Open source Android library. Implement choosing files and directories in your application.
3535
- [Floating Action Button SpeedDial](https://github.com/leinardi/FloatingActionButtonSpeedDial) - A Floating Action Button Speed Dial implementation for Android that follows the Material Design specification
36+
- [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.
3637
- [Material Dialogs](https://github.com/afollestad/material-dialogs) - A beautiful, fluid, and customizable dialogs API
3738
- [rclone](https://github.com/ncw/rclone) - "rsync for cloud storage"
3839
- Icon made by [Smashicons](https://www.flaticon.com/authors/smashicons) from [Flaticon](https://www.flaticon.com)

‎app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies {
3737
implementation 'com.mikepenz:community-material-typeface:2.0.46.1@aar'
3838
implementation 'com.mikepenz:fontawesome-typeface:5.0.6.0@aar'
3939
implementation "com.mikepenz:aboutlibraries:6.0.8"
40+
implementation 'us.feras.mdv:markdownview:1.1.0'
4041
testImplementation 'junit:junit:4.12'
4142
androidTestImplementation 'com.android.support.test:runner:1.0.1'
4243
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

‎app/src/main/AndroidManifest.xml

+8
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@
4545
android:name=".AboutActivity"
4646
android:label="@string/title_activity_about"
4747
android:theme="@style/AppTheme.NoActionBar" />
48+
49+
<activity
50+
android:name=".ChangelogActivity"
51+
android:label="@string/title_activity_changelog"
52+
android:theme="@style/AppTheme.NoActionBar"
53+
android:parentActivityName=".AboutActivity"/>
54+
55+
4856
</application>
4957

5058
</manifest>

‎app/src/main/assets/changelog.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### Version 0.3.0-alpha
2+
***
3+
4+
* **New:** Changelog added under About screen
5+
* **New:** Clicking on File/Folder icon will select it
6+
* **New:** App icon
7+
* **Fix:** Status bar color
8+
9+
***
10+

‎app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public boolean onSupportNavigateUp() {
7373
}
7474

7575
private void showChangelog() {
76-
Toast.makeText(this, "Coming soon", Toast.LENGTH_SHORT).show();
76+
Intent changelogIntent = new Intent(this, ChangelogActivity.class);
77+
startActivity(changelogIntent);
7778
}
7879

7980
private void showOpenSourceLibraries() {

‎app/src/main/java/ca/pkay/rcloneexplorer/ChangelogActivity.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package ca.pkay.rcloneexplorer;
2+
3+
import android.os.Bundle;
4+
import android.support.v7.app.ActionBar;
5+
import android.support.v7.app.AppCompatActivity;
6+
import android.support.v7.widget.Toolbar;
7+
8+
import us.feras.mdv.MarkdownView;
9+
10+
11+
public class ChangelogActivity extends AppCompatActivity {
12+
13+
@Override
14+
protected void onCreate(Bundle savedInstanceState) {
15+
super.onCreate(savedInstanceState);
16+
setContentView(R.layout.activity_changelog);
17+
Toolbar toolbar = findViewById(R.id.toolbar);
18+
setSupportActionBar(toolbar);
19+
ActionBar actionBar = getSupportActionBar();
20+
if (actionBar != null) {
21+
actionBar.setDisplayHomeAsUpEnabled(true);
22+
actionBar.setDisplayShowHomeEnabled(true);
23+
}
24+
25+
MarkdownView markdownView = findViewById(R.id.markdownView);
26+
markdownView.loadMarkdownFile("file:///android_asset/changelog.md");
27+
}
28+
29+
@Override
30+
public boolean onSupportNavigateUp() {
31+
onBackPressed();
32+
return true;
33+
}
34+
}

‎app/src/main/res/layout/activity_changelog.xml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:background="#DDDDDD"
8+
tools:context=".ChangelogActivity">
9+
10+
<android.support.design.widget.AppBarLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:theme="@style/AppTheme.AppBarOverlay">
14+
15+
<android.support.v7.widget.Toolbar
16+
android:id="@+id/toolbar"
17+
android:layout_width="match_parent"
18+
android:layout_height="?attr/actionBarSize"
19+
android:background="?attr/colorPrimary"
20+
app:popupTheme="@style/AppTheme.PopupOverlay" />
21+
22+
</android.support.design.widget.AppBarLayout>
23+
24+
<include layout="@layout/content_changelog" />
25+
26+
</android.support.design.widget.CoordinatorLayout>

‎app/src/main/res/layout/content_changelog.xml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<us.feras.mdv.MarkdownView
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
xmlns:tools="http://schemas.android.com/tools"
6+
android:layout_width="match_parent"
7+
android:layout_height="match_parent"
8+
android:id="@+id/markdownView"
9+
app:layout_behavior="@string/appbar_scrolling_view_behavior"
10+
tools:context=".AboutActivity"
11+
tools:showIn="@layout/activity_about" >
12+
</us.feras.mdv.MarkdownView>

‎app/src/main/res/values/about_libraries_markdown_view.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="define_MarkdownView"></string>
4+
<string name="library_MarkdownView_author">Feras Alnatsheh</string>
5+
<string name="library_MarkdownView_authorWebsite">https://github.com/falnatsheh/</string>
6+
<string name="library_MarkdownView_libraryName">Markdown View</string>
7+
<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>
8+
<string name="library_MarkdownView_libraryVersion"></string>
9+
<string name="library_MarkdownView_libraryWebsite">https://github.com/falnatsheh/MarkdownView/</string>
10+
<string name="library_MarkdownView_licenseId">apache_2.0</string>
11+
<string name="library_MarkdownView_isOpenSource">true</string>
12+
<string name="library_MarkdownView_repositoryLink">https://github.com/falnatsheh/MarkdownView/</string>
13+
</resources>

‎app/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77

88
<string name="action_settings">Settings</string>
99
<string name="title_activity_about">About</string>
10+
<string name="title_activity_changelog">Changelog</string>
1011
</resources>

0 commit comments

Comments
 (0)