Skip to content

B
beyond-clouds-android
Commit 7d3b156b by Author name
Options

Merge branch 'page-zhangjinxiong' into page-gaotong 

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/layout/fragment_other.xml
#	app/src/main/res/values/colors.xml
parents 57afaf11 c28708a4
Showing with 289 additions and 0 deletions
app/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cn.yunliyunwai.beyondclouds">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name=".BeyondApplication"
android:allowBackup="true"
......@@ -9,9 +14,11 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.page.PreviewActivity">
<activity android:name=".ui.page.PublishQuestionActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
......@@ -27,6 +34,13 @@
<activity android:name=".ui.page.ProjectPreviewAll"></activity>
<activity android:name=".ui.page.ProjectFileLink">
</activity>
<activity android:name=".ui.page.PublishBlogActivity">
</activity>
<activity android:name=".ui.page.ProjectsActivity"></activity>
<activity android:name=".ui.page.FansActivity" />
<activity
android:name=".SplashActivity"
android:theme="@style/AppTheme.FullScreen" />
<activity android:name=".MainActivity" />
</application>
<uses-permission android:name="android.permission.INTERNET" />
......
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/FansActivity.java 0 → 100644
package cn.yunliyunwai.beyondclouds.ui.page;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import cn.yunliyunwai.beyondclouds.databinding.ActivityFansBinding;
public class FansActivity extends AppCompatActivity {
private ActivityFansBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityFansBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
}
}
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/PreviewActivity.java 0 → 100644
package cn.yunliyunwai.beyondclouds.ui.page;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import cn.yunliyunwai.beyondclouds.databinding.ActivityPreviewBinding;
public class PreviewActivity extends AppCompatActivity {
private ActivityPreviewBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityPreviewBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
}
}
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/ProjectsActivity.java 0 → 100644
package cn.yunliyunwai.beyondclouds.ui.page;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import cn.yunliyunwai.beyondclouds.databinding.ActivityProjectsBinding;
public class ProjectsActivity extends AppCompatActivity {
private ActivityProjectsBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityProjectsBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
}
}
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/PublishBlogActivity.java 0 → 100644
package cn.yunliyunwai.beyondclouds.ui.page;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import cn.yunliyunwai.beyondclouds.R;
import cn.yunliyunwai.beyondclouds.databinding.ActivityPublishBlogBinding;
public class PublishBlogActivity extends AppCompatActivity {
private ActivityPublishBlogBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityPublishBlogBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
}
}
app/src/main/java/cn/yunliyunwai/beyondclouds/util/TimeUtils.java 0 → 100644
package cn.yunliyunwai.beyondclouds.util;
import java.util.Calendar;
import java.util.Date;
public class TimeUtils {
private static final String PREFIX_YEAR = "年";
private static final String PREFIX_MONTH = "月";
private static final String PREFIX_DAY = "天";
private static final String PREFIX_HOUR = "小时";
private static final String PREFIX_MINUTE = "分钟";
private static final String PREFIX_SECOND = "秒";
private static final String SUFFIX_BEFORE = "前";
private static final String SUFFIX_AFTER = "后";
private static final String SUFFIX_JUST_NOW = "刚刚";
public static String toMoment(Date date){
Calendar now = Calendar.getInstance();
now.setTime(new Date());
Calendar input = Calendar.getInstance();
input.setTime(date);
int yearDiff = now.get(Calendar.YEAR) - input.get(Calendar.YEAR);;
int monthDiff = now.get(Calendar.MONTH) - input.get(Calendar.MONTH);;
int dayDiff = now.get(Calendar.DAY_OF_MONTH) -input.get(Calendar.DAY_OF_MONTH);
int hourDiff = now.get(Calendar.HOUR) - input.get(Calendar.HOUR);
int minuteDiff = now.get(Calendar.MINUTE) - input.get(Calendar.MINUTE);
int secondDiff = now.get(Calendar.SECOND) - input.get(Calendar.SECOND);
int number;
String prefix;
String suffix;
if (yearDiff != 0) {
number = Math.abs(yearDiff);
prefix = PREFIX_YEAR;
suffix = yearDiff > 0 ? SUFFIX_BEFORE : SUFFIX_AFTER;
} else if (monthDiff != 0) {
number = Math.abs(monthDiff);
prefix = PREFIX_MONTH;
suffix = monthDiff > 0 ? SUFFIX_BEFORE : SUFFIX_AFTER;
} else if (dayDiff != 0) {
number = Math.abs(dayDiff);
prefix = PREFIX_DAY;
suffix = dayDiff > 0 ? SUFFIX_BEFORE : SUFFIX_AFTER;
} else if (hourDiff != 0) {
number = Math.abs(hourDiff);
prefix = PREFIX_HOUR;
suffix = hourDiff > 0 ? SUFFIX_AFTER : SUFFIX_BEFORE;
} else if (minuteDiff != 0) {
number = Math.abs(minuteDiff);
prefix = PREFIX_MINUTE;
suffix = monthDiff > 0 ? SUFFIX_BEFORE : SUFFIX_AFTER;
} else if (secondDiff != 0) {
number = Math.abs(secondDiff);
prefix = PREFIX_SECOND;
suffix = secondDiff > 0 ? SUFFIX_BEFORE : SUFFIX_AFTER;
} else {
number = 0;
prefix = suffix = SUFFIX_JUST_NOW;
}
return number == 0 ? suffix : number + prefix + suffix;
}
}
app/src/main/res/layout/activity_publish_blog.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
tools:context=".ui.page.PublishBlogActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout1"
android:layout_width="match_parent"
android:layout_height="64dp"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="0dp">
<TextView
android:layout_width="30dp"
android:layout_height="19dp"
android:text="预览"
android:textColor="@color/preview"
android:textSize="15sp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="13dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<View
android:id="@+id/postDivider"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/colorLine"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ScrollView
android:id="@+id/scrollView2"
android:layout_width="0dp"
android:layout_height="300dp"
android:fadingEdge="vertical"
android:scrollbars="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout1">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout2"
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_marginStart="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout1">
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="文章标题"
android:textColor="@color/colorGray"
android:textSize="20sp"
android:layout_marginTop="20dp"
android:background="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<EditText
android:id="@+id/introFrame"
android:layout_width="match_parent"
android:layout_height="43dp"
android:text="请输入文章简介"
android:textColor="@color/colorText"
android:textSize="13sp"
android:paddingLeft="15dp"
android:layout_marginTop="60dp"
android:background="@color/colorTextBackground"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="正文"
android:textColor="@color/colorText"
android:textSize="13sp"
android:background="@null"
android:layout_marginTop="17dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/introFrame"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout3"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/colorToolBackground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scrollView2">
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/colors.xml
......@@ -2,6 +2,7 @@
<resources>
<color name="colorPrimary">#00AAE6</color>
<color name="colorPrimaryTouched">#00AAFF</color>
<color name="preview">#00aae6</color>
<color name="colorPrimaryDark">#333333</color>
<color name="colorAccent">#03DAC5</color>
<!-- <color name="colorBackground">#EDF5F8</color>-->
......@@ -10,6 +11,8 @@
<color name="colorWhiteTouched">#a0eeeeee</color>
<color name="colorStatusBar">#ffffff</color>
<color name="colorText">#999999</color>
<color name="colorTextBackground">#f4f8fa</color>
<color name="colorToolBackground">#f5f8fa</color>
<color name="colorGray">#666666</color>
<color name="colorTextAccent">#333333</color>
<color name="colorBackgroundTopicTouched">#3000AAE6</color>
......@@ -18,4 +21,7 @@
<color name="colorBackgroundPostWritingChoice">#f5f8fa</color>
<color name="dividerColor">#e6e5e6</color>
<color name="colorFollow">#17bf58</color>
<color name="colorIconHot">#FF7474</color>
<color name="colorLine">#F0F0F0</color>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment