Skip to content

Commit

Permalink
*Login prompt on sub feed when not logged in
Browse files Browse the repository at this point in the history
*About activity
*Minor changes
  • Loading branch information
powerpoint45 committed Jun 20, 2018
1 parent 7471515 commit 4f74ff4
Show file tree
Hide file tree
Showing 18 changed files with 415 additions and 92 deletions.
Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 15 additions & 18 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "26.0.2"
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "com.powerpoint45.dtube"
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 27
versionCode 2
versionName "1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -20,20 +20,17 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation fileTree(include: ['*.jar'], dir: 'libs')

compile 'me.dm7.barcodescanner:zxing:1.9.8'
//compile 'us.feras.mdv:markdownview:1.1.0'
compile 'com.github.curioustechizen.android-ago:library:1.3.4'
compile 'cn.jzvd:jiaozivideoplayer:6.1.2'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.github.javiersantos:AppUpdater:2.6.3'
compile 'com.makeramen:roundedimageview:2.3.0'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0'
testCompile 'junit:junit:4.12'
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
compile 'us.feras.mdv:markdownview:1.1.0'
implementation 'com.github.curioustechizen.android-ago:library:1.3.4'
implementation 'cn.jzvd:jiaozivideoplayer:6.1.2'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.github.javiersantos:AppUpdater:2.6.3'
implementation 'com.makeramen:roundedimageview:2.3.0'

implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
}

This file was deleted.

10 changes: 10 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@
</intent-filter>
</activity>

<activity
android:name=".AboutActivity"
android:label="@string/about"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:windowSoftInputMode="stateHidden|adjustResize"
android:configChanges="orientation|screenLayout|keyboard|keyboardHidden|navigation|fontScale|mcc|mnc|locale|touchscreen|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>


</application>
Expand Down
265 changes: 265 additions & 0 deletions app/src/main/assets/paperwhite.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
html {
font-size: 100%;
overflow-y: scroll;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}

body {
color: #444;
font-family: Georgia, Palatino, 'Palatino Linotype', Times,
'Times New Roman', serif;
font-size: 12px;
line-height: 1.5em;
padding: 1em;
margin: auto;
max-width: 42em;
background: #fefefe;
}

a {
color: #0645ad;
text-decoration: none;
}

a:visited {
color: #0b0080;
}

a:hover {
color: #06e;
}

a:active {
color: #faa700;
}

a:focus {
outline: thin dotted;
}

a:hover,a:active {
outline: 0;
}

::-moz-selection {
background: rgba(255, 255, 0, 0.3);
color: #000
}

::selection {
background: rgba(255, 255, 0, 0.3);
color: #000
}

a::-moz-selection {
background: rgba(255, 255, 0, 0.3);
color: #0645ad
}

a::selection {
background: rgba(255, 255, 0, 0.3);
color: #0645ad
}

p {
margin: 1em 0;
}

img {
max-width: 100%;
}

h1,h2,h3,h4,h5,h6 {
font-weight: normal;
color: #111;
line-height: 1em;
}

h4,h5,h6 {
font-weight: bold;
}

h1 {
font-size: 2.5em;
}

h2 {
font-size: 2em;
}

h3 {
font-size: 1.5em;
}

h4 {
font-size: 1.2em;
}

h5 {
font-size: 1em;
}

h6 {
font-size: 0.9em;
}

blockquote {
color: #666666;
margin: 0;
padding-left: 3em;
border-left: 0.5em #EEE solid;
}

hr {
display: block;
height: 2px;
border: 0;
border-top: 1px solid #aaa;
border-bottom: 1px solid #eee;
margin: 1em 0;
padding: 0;
}

pre,code,kbd,samp {
color: #000;
font-family: monospace, monospace;
_font-family: 'courier new', monospace;
font-size: 0.98em;
}

pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
}

b,strong {
font-weight: bold;
}

dfn {
font-style: italic;
}

ins {
background: #ff9;
color: #000;
text-decoration: none;
}

mark {
background: #ff0;
color: #000;
font-style: italic;
font-weight: bold;
}

sub,sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}

sup {
top: -0.5em;
}

sub {
bottom: -0.25em;
}

ul,ol {
margin: 1em 0;
padding: 0 0 0 2em;
}

li p:last-child {
margin: 0
}

dd {
margin: 0 0 0 2em;
}

img {
border: 0;
-ms-interpolation-mode: bicubic;
vertical-align: middle;
}

table {
border-collapse: collapse;
border-spacing: 0;
}

td {
vertical-align: top;
}

@media only screen and (min-width: 480px) {
body {
font-size: 14px;
}
}

@media only screen and (min-width: 768px) {
body {
font-size: 16px;
}
}

@media print {
* {
background: transparent !important;
color: black !important;
filter: none !important;
-ms-filter: none !important;
}
body {
font-size: 12pt;
max-width: 100%;
}
a,a:visited {
text-decoration: underline;
}
hr {
height: 1px;
border: 0;
border-bottom: 1px solid black;
}
a[href]:after {
content: " (" attr(href) ")";
}
abbr[title]:after {
content: " (" attr(title) ")";
}
.ir a:after,a[href ^="javascript:"]:after,a[href ^="#"]:after {
content: "";
}
pre,blockquote {
border: 1px solid #999;
padding-right: 1em;
page-break-inside: avoid;
}
tr,img {
page-break-inside: avoid;
}
img {
max-width: 100% !important;
}
@page :left {
margin: 15mm 20mm 15mm 10mm;
}
@page :right {
margin: 15mm 10mm 15mm 20mm;
}
p,h2,h3 {
orphans: 3;
widows: 3;
}
h2,h3 {
page-break-after: avoid;
}
}
Loading

0 comments on commit 4f74ff4

Please sign in to comment.